From 5abcae9255a53aa6f7036bbc3c609623bbada950 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 1 Nov 2020 22:46:01 +0100 Subject: [PATCH] Fixed some typos in the code base I used code spell checker and did all the libraries/classes/*.php files one by one. Signed-off-by: William Desportes --- libraries/classes/Config.php | 2 +- libraries/classes/Core.php | 2 +- libraries/classes/CreateAddField.php | 2 +- libraries/classes/DatabaseInterface.php | 6 +++--- libraries/classes/Error.php | 2 +- libraries/classes/Git.php | 2 +- libraries/classes/Header.php | 2 +- libraries/classes/Partition.php | 4 ++-- libraries/classes/Relation.php | 2 +- libraries/classes/Session.php | 2 +- libraries/classes/Table.php | 4 ++-- libraries/classes/Tracker.php | 2 +- libraries/classes/Tracking.php | 2 +- libraries/classes/TwoFactor.php | 2 +- libraries/classes/Url.php | 2 +- libraries/classes/Util.php | 12 ++++++------ libraries/classes/VersionInformation.php | 4 ++-- libraries/classes/ZipExtension.php | 4 ++-- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 0e301a2366..eb84236ee3 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -480,7 +480,7 @@ class Config * These can be confusing for user configuration layer as it * flatten array using / and thus don't see difference between * $cfg['Export/method'] and $cfg['Export']['method'], while rest - * of thre code uses the setting only in latter form. + * of the code uses the setting only in latter form. * * This could be removed once we consistently handle both values * in the functional code as well. diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index bf220c3d8b..834ed769ed 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -1148,7 +1148,7 @@ class Core case 'i': case 'd': /* bool, integer or double */ - // skip value to sepearator + // skip value to separator $i = strpos($data, ';', $i); if ($i === false) { return null; diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 1e90517d8e..8f9873df1c 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -381,7 +381,7 @@ class CreateAddField /** * Returns the definition of a partition/subpartition * - * @param array $partition array of partition/subpartition detiails + * @param array $partition array of partition/subpartition details * @param bool $isSubPartition whether a subpartition * * @return string partition/subpartition definition diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 2e4241d023..82d397b955 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -1153,7 +1153,7 @@ class DatabaseInterface implements DbalInterface } /** - * This function checks and initialises the phpMyAdmin configuration + * This function checks and initializes the phpMyAdmin configuration * storage state before it is used into session cache. * * @return void @@ -1548,7 +1548,7 @@ class DatabaseInterface implements DbalInterface * @param string $which PROCEDURE | FUNCTION or null for both * @param string $name name of the routine (to fetch a specific routine) * - * @return array information about ROCEDUREs or FUNCTIONs + * @return array information about PROCEDUREs or FUNCTIONs */ public function getRoutines( string $db, @@ -2438,7 +2438,7 @@ class DatabaseInterface implements DbalInterface } /** - * Whether connection is Percona + * Whether connection is PerconaDB */ public function isPercona(): bool { diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php index 33a1e944ed..eee27159dd 100644 --- a/libraries/classes/Error.php +++ b/libraries/classes/Error.php @@ -153,7 +153,7 @@ class Error extends Message } /** - * Process backtrace to avoid path disclossures, objects and so on + * Process backtrace to avoid path disclosures, objects and so on * * @param array $backtrace backtrace * diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php index b8390fc3bb..522d75b75f 100644 --- a/libraries/classes/Git.php +++ b/libraries/classes/Git.php @@ -299,7 +299,7 @@ class Git } } else { // '.git/objects/info/packs' file can be missing - // (atlease in mysGit) + // (at least in mysGit) // File missing. May be we can look in the .git/object/pack // directory for all the .pack files and use that list of // files instead diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 08804a2cf3..452dc6d2a1 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -694,7 +694,7 @@ class Header * Returns the phpMyAdmin version to be appended to the url to avoid caching * between versions * - * @return string urlenocded pma version as a parameter + * @return string urlencoded pma version as a parameter */ public static function getVersionParameter(): string { diff --git a/libraries/classes/Partition.php b/libraries/classes/Partition.php index 7bc606a2f2..bea04e5d9a 100644 --- a/libraries/classes/Partition.php +++ b/libraries/classes/Partition.php @@ -42,7 +42,7 @@ class Partition extends SubPartition } /** - * Returns the partiotion description + * Returns the partition description * * @return string partition description */ @@ -112,7 +112,7 @@ class Partition extends SubPartition } /** - * Returns the tatal index length + * Returns the total index length * * @return int index length */ diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 0abe7329fb..410e33e497 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -1900,7 +1900,7 @@ class Relation * @param string $db name of master table db. * @param string $table name of master table. * @param string $column name of master table column. - * @param array|null $foreigners_full foreiners array for the whole table. + * @param array|null $foreigners_full foreigners array for the whole table. * @param array|null $child_references_full child references for the whole table. * * @return array telling about references if foreign key. diff --git a/libraries/classes/Session.php b/libraries/classes/Session.php index e4984eeb13..f68bad2495 100644 --- a/libraries/classes/Session.php +++ b/libraries/classes/Session.php @@ -193,7 +193,7 @@ class Session $httpCookieName = $config->getCookieName('phpMyAdmin'); @session_name($httpCookieName); - // Restore correct sesion ID (it might have been reset by auto started session + // Restore correct session ID (it might have been reset by auto started session if ($config->issetCookie('phpMyAdmin')) { session_id($config->getCookie('phpMyAdmin')); } diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 47a31f5c17..ee4617c657 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -1341,7 +1341,7 @@ class Table $sql_drop_query .= ' ' . $source; $dbi->query($sql_drop_query); - // Renable table in configuration storage + // Rename table in configuration storage $relation->renameTable( $source_db, $target_db, @@ -1650,7 +1650,7 @@ class Table $this->name = $new_name; $this->dbName = $new_db; - // Renable table in configuration storage + // Rename table in configuration storage $this->relation->renameTable( $old_db, $new_db, diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 7ded2d4b6c..c60e9633ad 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -126,7 +126,7 @@ class Tracker } /** - * Gets the tracking status of a table, is it active or deactive ? + * Gets the tracking status of a table, is it active or disabled ? * * @param string $dbname name of database * @param string $tablename name of table diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index c3a97c5402..2ba38c0ec7 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -513,7 +513,7 @@ class Tracking $ddlog_count, $drop_image_or_text ) { - // no need for the secondth returned parameter + // no need for the second returned parameter [$html] = $this->getHtmlForDataStatements( $data, $filter_users, diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index 4cd8e33a3d..f8fc4bd0a0 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -242,7 +242,7 @@ class TwoFactor /** * Changes two-factor authentication settings * - * The object might stay in partialy changed setup + * The object might stay in partially changed setup * if configuration fails. * * @param string $name Backend name diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php index 8225be6fc7..7774c31b95 100644 --- a/libraries/classes/Url.php +++ b/libraries/classes/Url.php @@ -214,7 +214,7 @@ class Url $separator = self::getArgSeparator(); - // avoid overwriting when creating navi panel links to servers + // avoid overwriting when creating navigation panel links to servers if (isset($GLOBALS['server']) && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault'] && ! isset($params['server']) diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 117288f07e..c96e91a2dc 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -177,7 +177,7 @@ class Util * @param string $quoted_string string to remove quotes from * @param string $quote type of quote to remove * - * @return string unqoted string + * @return string unquoted string */ public static function unQuote(string $quoted_string, ?string $quote = null): string { @@ -255,7 +255,7 @@ class Util /** * Get a URL link to the official documentation page of either MySQL - * or MariaDB depending on the databse server + * or MariaDB depending on the database server * of the user. * * @param bool $isMariaDB if the database server is MariaDB @@ -2302,7 +2302,7 @@ class Util /** * Returns server type for current connection * - * Known types are: MariaDB, Percona and MySQL (default) + * Known types are: MariaDB, PerconaDB and MySQL (default) * * @return string */ @@ -2907,7 +2907,7 @@ class Util } /** - * Returs list of used PHP extensions. + * Returns list of used PHP extensions. * * @return string[] */ @@ -2930,7 +2930,7 @@ class Util } /** - * Converts given (request) paramter to string + * Converts given (request) parameter to string * * @param mixed $value Value to convert */ @@ -2979,7 +2979,7 @@ class Util } /** - * Wraper around PHP date function + * Wrapper around PHP date function * * @param string $format Date format string * diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php index 75da7df95d..78f1ce1242 100644 --- a/libraries/classes/VersionInformation.php +++ b/libraries/classes/VersionInformation.php @@ -1,6 +1,6 @@