diff --git a/libraries/classes/Config/Settings/Server.php b/libraries/classes/Config/Settings/Server.php index 79b14f08ba..1d86a8eb77 100644 --- a/libraries/classes/Config/Settings/Server.php +++ b/libraries/classes/Config/Settings/Server.php @@ -598,11 +598,11 @@ final class Server /** * Maximum number of records saved in $cfg['Servers'][$i]['table_uiprefs'] table. * - * In case where tables in databases is modified (e.g. dropped or renamed), - * table_uiprefs may contains invalid data (referring to tables which are not + * In case where tables in databases are modified (e.g. dropped or renamed), + * table_uiprefs may contains invalid data (referring to tables which do not * exist anymore). - * This configuration make sure that we only keep N (N = MaxTableUiprefs) - * newest record in table_uiprefs and automatically delete older records. + * This configuration makes sure that we only keep N (N = MaxTableUiprefs) + * newest records in table_uiprefs and automatically delete older records. * * ```php * $cfg['Servers'][$i]['MaxTableUiprefs'] = 100; diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index 601a106739..3047a2927f 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -1169,7 +1169,7 @@ class Qbe // Candidates restricted in index+where } else { $candidateColumns = $stillGood; - // None of the candidates where in a where-clause + // None of the candidates were in a where-clause } return $candidateColumns; diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 96842fae3b..b17b56a631 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -1671,7 +1671,7 @@ class InsertEdit // when in UPDATE mode, do not alter field's contents. When in INSERT // mode, insert empty field because no values were submitted. - // If protected blobs where set, insert original fields content. + // If protected blobs were set, insert original field's content. if ($protectedValue !== '') { return '0x' . bin2hex($protectedValue); } diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index f69d8f5f13..3700ab17af 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -2459,7 +2459,7 @@ class Privileges } $sqlQuery = ''; - // Some reports where sent to the error reporting server with phpMyAdmin 5.1.0 + // Some reports were sent to the error reporting server with phpMyAdmin 5.1.0 // pred_username was reported to be not defined $predUsername = $_POST['pred_username'] ?? ''; if ($predUsername === 'any') { diff --git a/scripts/check-release-excludes.sh b/scripts/check-release-excludes.sh index 9592ee1a56..8b1a5efb56 100755 --- a/scripts/check-release-excludes.sh +++ b/scripts/check-release-excludes.sh @@ -343,7 +343,7 @@ for filePath in ${FILE_LIST}; do done if [ ${found} -gt 0 ]; then - echo 'Some new files to be excluded where found.' + echo 'Some new files to be excluded were found.' echo 'Please update create-release.sh' exit 1 else diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 73910ac1a4..cd5d323155 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -615,7 +615,7 @@ for kit in $KITS ; do rm -r templates/test/ rm phpunit.xml.* build.xml 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 - # Gettext po files (if they where not removed by ./scripts/lang-cleanup.sh) + # Gettext po files (if they were not removed by ./scripts/lang-cleanup.sh) rm -rf po # Documentation source code mv doc/html htmldoc diff --git a/test/classes/Controllers/Import/ImportControllerTest.php b/test/classes/Controllers/Import/ImportControllerTest.php index fd2fd69ed1..adb5b7b39e 100644 --- a/test/classes/Controllers/Import/ImportControllerTest.php +++ b/test/classes/Controllers/Import/ImportControllerTest.php @@ -41,7 +41,7 @@ class ImportControllerTest extends AbstractTestCase parent::loadResponseIntoContainerBuilder(); - // Some params where not added as they where not required for this test + // Some params were not added as they are not required for this test $GLOBALS['db'] = 'pma_test'; $GLOBALS['table'] = 'table1'; $GLOBALS['sql_query'] = 'SELECT A.*' . "\n" diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index b6160b1c7f..641f282cac 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -135,7 +135,7 @@ abstract class TestBase extends TestCase $this->webDriver->manage()->window()->maximize(); if (! static::$createDatabase) { - // Stop here, we where not asked to create a database + // Stop here, we were not asked to create a database return; }