Skip to content

Commit ec12d8d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18265 from MoonE/comment-typos
Fix some comment typos
2 parents f6aaa53 + 79ab3df commit ec12d8d

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎libraries/classes/Config/Settings/Server.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,11 +598,11 @@ final class Server
598598
/**
599599
* Maximum number of records saved in $cfg['Servers'][$i]['table_uiprefs'] table.
600600
*
601-
* In case where tables in databases is modified (e.g. dropped or renamed),
602-
* table_uiprefs may contains invalid data (referring to tables which are not
601+
* In case where tables in databases are modified (e.g. dropped or renamed),
602+
* table_uiprefs may contains invalid data (referring to tables which do not
603603
* exist anymore).
604-
* This configuration make sure that we only keep N (N = MaxTableUiprefs)
605-
* newest record in table_uiprefs and automatically delete older records.
604+
* This configuration makes sure that we only keep N (N = MaxTableUiprefs)
605+
* newest records in table_uiprefs and automatically delete older records.
606606
*
607607
* ```php
608608
* $cfg['Servers'][$i]['MaxTableUiprefs'] = 100;

‎libraries/classes/Database/Qbe.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ private function getLeftJoinColumnCandidates(
11691169
// Candidates restricted in index+where
11701170
} else {
11711171
$candidateColumns = $stillGood;
1172-
// None of the candidates where in a where-clause
1172+
// None of the candidates were in a where-clause
11731173
}
11741174

11751175
return $candidateColumns;

‎libraries/classes/InsertEdit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@ private function formatAsSqlValueBasedOnType(
16711671

16721672
// when in UPDATE mode, do not alter field's contents. When in INSERT
16731673
// mode, insert empty field because no values were submitted.
1674-
// If protected blobs where set, insert original fields content.
1674+
// If protected blobs were set, insert original field's content.
16751675
if ($protectedValue !== '') {
16761676
return '0x' . bin2hex($protectedValue);
16771677
}

‎libraries/classes/Server/Privileges.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2459,7 +2459,7 @@ public function addUser(
24592459
}
24602460

24612461
$sqlQuery = '';
2462-
// Some reports where sent to the error reporting server with phpMyAdmin 5.1.0
2462+
// Some reports were sent to the error reporting server with phpMyAdmin 5.1.0
24632463
// pred_username was reported to be not defined
24642464
$predUsername = $_POST['pred_username'] ?? '';
24652465
if ($predUsername === 'any') {

‎scripts/check-release-excludes.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ for filePath in ${FILE_LIST}; do
343343
done
344344

345345
if [ ${found} -gt 0 ]; then
346-
echo 'Some new files to be excluded where found.'
346+
echo 'Some new files to be excluded were found.'
347347
echo 'Please update create-release.sh'
348348
exit 1
349349
else

‎scripts/create-release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ for kit in $KITS ; do
615615
rm -r templates/test/
616616
rm phpunit.xml.* build.xml
617617
rm .editorconfig .browserslistrc .eslintignore .jshintrc .eslintrc.json .stylelintrc.json psalm.xml psalm-baseline.xml phpstan.neon.dist phpstan-baseline.neon phpcs.xml.dist jest.config.cjs infection.json.dist
618-
# Gettext po files (if they where not removed by ./scripts/lang-cleanup.sh)
618+
# Gettext po files (if they were not removed by ./scripts/lang-cleanup.sh)
619619
rm -rf po
620620
# Documentation source code
621621
mv doc/html htmldoc

‎test/classes/Controllers/Import/ImportControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testIndexParametrized(): void
4141

4242
parent::loadResponseIntoContainerBuilder();
4343

44-
// Some params where not added as they where not required for this test
44+
// Some params were not added as they are not required for this test
4545
$GLOBALS['db'] = 'pma_test';
4646
$GLOBALS['table'] = 'table1';
4747
$GLOBALS['sql_query'] = 'SELECT A.*' . "\n"

‎test/selenium/TestBase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function setUp(): void
135135
$this->webDriver->manage()->window()->maximize();
136136

137137
if (! static::$createDatabase) {
138-
// Stop here, we where not asked to create a database
138+
// Stop here, we were not asked to create a database
139139
return;
140140
}
141141

0 commit comments

Comments
 (0)