From 9cf1459a303275a56f887d8bea5f41c95dccd22c Mon Sep 17 00:00:00 2001 From: Jennifer Hodgdon Date: Thu, 18 Sep 2014 08:54:40 -0700 Subject: [PATCH] Issue #2329703 by maximpodorov: Fix spelling in varous files --- core/lib/Drupal/Component/Datetime/DateTimePlus.php | 2 +- core/lib/Drupal/Component/Gettext/PoStreamReader.php | 2 +- .../Plugin/Discovery/CachedDiscoveryInterface.php | 2 +- .../Component/Transliteration/PHPTransliteration.php | 2 +- core/lib/Drupal/Component/Utility/OpCodeCache.php | 2 +- core/lib/Drupal/Core/Ajax/DataCommand.php | 2 +- core/lib/Drupal/Core/Archiver/ArchiveTar.php | 6 +++--- core/lib/Drupal/Core/Asset/CssCollectionRenderer.php | 4 ++-- .../Core/Authentication/AuthenticationManager.php | 2 +- core/lib/Drupal/Core/Block/BlockBase.php | 2 +- core/lib/Drupal/Core/Block/BlockPluginInterface.php | 2 +- core/lib/Drupal/Core/Cache/CacheCollector.php | 4 ++-- core/lib/Drupal/Core/Cache/CacheContexts.php | 4 ++-- core/lib/Drupal/Core/Cache/ChainedFastBackend.php | 2 +- core/lib/Drupal/Core/Cache/DatabaseBackend.php | 4 ++-- .../Core/Config/Entity/ConfigEntityInterface.php | 2 +- core/lib/Drupal/Core/Config/FileStorage.php | 2 +- core/lib/Drupal/Core/Config/StorageComparer.php | 2 +- .../Core/Config/TypedConfigManagerInterface.php | 2 +- .../Drupal/Core/Controller/HtmlFormController.php | 2 +- .../Drupal/Core/Database/Driver/pgsql/Connection.php | 12 ++++++------ .../Core/Database/Driver/pgsql/Install/Tasks.php | 2 +- .../lib/Drupal/Core/Database/Driver/pgsql/Select.php | 6 +++--- .../Drupal/Core/Database/Driver/sqlite/Schema.php | 8 ++++---- .../Drupal/Core/Database/InvalidQueryException.php | 2 +- .../Core/Database/Query/FieldsOverlapException.php | 2 +- core/lib/Drupal/Core/Database/Query/Merge.php | 2 +- core/lib/Drupal/Core/Database/Schema.php | 4 ++-- .../DependencyInjection/ClassResolverInterface.php | 2 +- .../Compiler/RegisterKernelListenersPass.php | 2 +- core/lib/Drupal/Core/DrupalKernel.php | 2 +- core/lib/Drupal/Core/Entity/ContentEntityBase.php | 8 ++++---- .../lib/Drupal/Core/Entity/EntityResolverManager.php | 2 +- .../Core/Entity/Sql/SqlContentEntityStorage.php | 6 +++--- .../Drupal/Core/EventSubscriber/AjaxSubscriber.php | 2 +- .../ContentFormControllerSubscriber.php | 2 +- .../EventSubscriber/FinishResponseSubscriber.php | 2 +- core/lib/Drupal/Core/Field/WidgetBase.php | 2 +- .../Drupal/Core/File/MimeType/MimeTypeGuesser.php | 2 +- core/lib/Drupal/Core/Form/FormBuilder.php | 2 +- .../lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php | 2 +- core/lib/Drupal/Core/Path/AliasManagerInterface.php | 2 +- .../Drupal/Core/Plugin/Discovery/HookDiscovery.php | 2 +- core/lib/Drupal/Core/Render/Element/MachineName.php | 2 +- core/lib/Drupal/Core/Render/Element/Table.php | 4 ++-- core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php | 2 +- core/lib/Drupal/Core/Routing/UrlGenerator.php | 2 +- core/lib/Drupal/Core/Session/AccountProxy.php | 2 +- .../Core/StringTranslation/TranslationManager.php | 2 +- core/lib/Drupal/Core/Theme/ThemeManagerInterface.php | 2 +- .../Drupal/Core/TypedData/TranslatableInterface.php | 2 +- 51 files changed, 74 insertions(+), 74 deletions(-) diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php index fedab23ee3..68218f5333 100644 --- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php +++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php @@ -287,7 +287,7 @@ protected function prepareTime($time) { * Prepares the input timezone value. * * Changes the timezone before trying to use it, if necessary. - * Most imporantly, makes sure there is a valid timezone + * Most importantly, makes sure there is a valid timezone * object before moving further. * * @param mixed $timezone diff --git a/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/core/lib/Drupal/Component/Gettext/PoStreamReader.php index f0f4ea5e42..94218e6feb 100644 --- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php +++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php @@ -438,7 +438,7 @@ private function readLine() { return; } elseif (!strncmp("msgstr", $line, 6)) { - // A string pair for an msgidid (with optional context). + // A string pair for an msgid (with optional context). if (($this->_context != 'MSGID') && ($this->_context != 'MSGCTXT')) { // Strings are only valid within an id or context scope. diff --git a/core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php b/core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php index 8477f1e0d5..a9d95fc2c5 100644 --- a/core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/CachedDiscoveryInterface.php @@ -8,7 +8,7 @@ namespace Drupal\Component\Plugin\Discovery; /** - * Interface for discovery compenents holding a cache of plugin definitions. + * Interface for discovery components holding a cache of plugin definitions. */ interface CachedDiscoveryInterface extends DiscoveryInterface { diff --git a/core/lib/Drupal/Component/Transliteration/PHPTransliteration.php b/core/lib/Drupal/Component/Transliteration/PHPTransliteration.php index 0db053893e..175bf175f8 100644 --- a/core/lib/Drupal/Component/Transliteration/PHPTransliteration.php +++ b/core/lib/Drupal/Component/Transliteration/PHPTransliteration.php @@ -210,7 +210,7 @@ protected function readLanguageOverrides($langcode) { * Reads in generic transliteration data for a bank of characters. * * The data is read in from a file named "x$bank.php" (with $bank in - * hexidecimal notation) in PHPTransliteration::$dataDirectory. These files + * hexadecimal notation) in PHPTransliteration::$dataDirectory. These files * should set up a variable $bank containing an array whose numerical indices * are the remaining two bytes of the character code, and whose values are the * transliterations of these characters into US-ASCII. Note that the maximum diff --git a/core/lib/Drupal/Component/Utility/OpCodeCache.php b/core/lib/Drupal/Component/Utility/OpCodeCache.php index 1d54624548..3bdb327543 100644 --- a/core/lib/Drupal/Component/Utility/OpCodeCache.php +++ b/core/lib/Drupal/Component/Utility/OpCodeCache.php @@ -29,7 +29,7 @@ public static function invalidate($pathname) { if (extension_loaded('Zend OPcache')) { opcache_invalidate($pathname, TRUE); } - // If apcu extenstion is enabled in PHP 5.5 or greater it emulates apc. + // If apcu extension is enabled in PHP 5.5 or greater it emulates apc. // This is to provide an easy upgrade path if you are using apc's user // caching however the emulation does not extend to opcode caching. // Therefore we need to check if the function exists as well. diff --git a/core/lib/Drupal/Core/Ajax/DataCommand.php b/core/lib/Drupal/Core/Ajax/DataCommand.php index 262649de70..5b40e30ecb 100644 --- a/core/lib/Drupal/Core/Ajax/DataCommand.php +++ b/core/lib/Drupal/Core/Ajax/DataCommand.php @@ -40,7 +40,7 @@ class DataCommand implements CommandInterface { protected $name; /** - * The value of the data to be atached to elements matched by the selector. + * The value of the data to be attached to elements matched by the selector. * * The data is not limited to strings; it can be any format. * diff --git a/core/lib/Drupal/Core/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php index b891f92795..ac54bde3aa 100644 --- a/core/lib/Drupal/Core/Archiver/ArchiveTar.php +++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php @@ -118,7 +118,7 @@ function __construct($p_tarname, $p_compress = null) if ($data == "\37\213") { $this->_compress = true; $this->_compress_type = 'gz'; - // No sure it's enought for a magic code .... + // No sure it's enough for a magic code .... } elseif ($data == "BZ") { $this->_compress = true; $this->_compress_type = 'bz2'; @@ -617,7 +617,7 @@ function setAttribute() break; default : - $this->_error('Unknow attribute code '.$v_att_list[$i].''); + $this->_error('Unknown attribute code '.$v_att_list[$i].''); return false; } @@ -1826,7 +1826,7 @@ function _dirCheck($p_dir) /** * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar", - * rand emove double slashes. + * rand remove double slashes. * * @param string $p_dir path to reduce * diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php index 0d482fb78c..ab07555ea7 100644 --- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php +++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php @@ -68,11 +68,11 @@ public function render(array $css_assets) { for ($i = 0; $i < count($css_assets_keys); $i++) { $css_asset = $css_assets[$css_assets_keys[$i]]; switch ($css_asset['type']) { - // For file items, there are three possibilites. + // For file items, there are three possibilities. // - There are up to 31 CSS assets on the page (some of which may be // aggregated). In this case, output a LINK tag for file CSS assets. // - There are more than 31 CSS assets on the page, yet we must stay - // below IE<10's limit of 31 total CSS inclussion tags, we handle this + // below IE<10's limit of 31 total CSS inclusion tags, we handle this // in two ways: // - file CSS assets that are not eligible for aggregation (their // 'preprocess' flag has been set to FALSE): in this case, output a diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php index 7c357c9d16..0553d0936b 100644 --- a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php +++ b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php @@ -89,7 +89,7 @@ public function authenticate(Request $request) { $account = NULL; - // Iterate the availlable providers. + // Iterate the available providers. foreach ($this->getSortedProviders() as $provider_id => $provider) { if ($provider->applies($request)) { // Try to authenticate with this provider, skipping all others. diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php index 626650269d..3768c32730 100644 --- a/core/lib/Drupal/Core/Block/BlockBase.php +++ b/core/lib/Drupal/Core/Block/BlockBase.php @@ -355,7 +355,7 @@ public function blockForm($form, FormStateInterface $form_state) { * {@inheritdoc} * * Most block plugins should not override this method. To add validation - * for a specific block type, override BlockBase::blockValdiate(). + * for a specific block type, override BlockBase::blockValidate(). * * @see \Drupal\Core\Block\BlockBase::blockValidate() */ diff --git a/core/lib/Drupal/Core/Block/BlockPluginInterface.php b/core/lib/Drupal/Core/Block/BlockPluginInterface.php index 200d10de4a..e363d7c4e3 100644 --- a/core/lib/Drupal/Core/Block/BlockPluginInterface.php +++ b/core/lib/Drupal/Core/Block/BlockPluginInterface.php @@ -21,7 +21,7 @@ * * @todo Add detailed documentation here explaining the block system's * architecture and the relationships between the various objects, including - * brif references to the important components that are not coupled to the + * brief references to the important components that are not coupled to the * interface. * * @ingroup block_api diff --git a/core/lib/Drupal/Core/Cache/CacheCollector.php b/core/lib/Drupal/Core/Cache/CacheCollector.php index b90327ec92..ab261eb5b8 100644 --- a/core/lib/Drupal/Core/Cache/CacheCollector.php +++ b/core/lib/Drupal/Core/Cache/CacheCollector.php @@ -200,10 +200,10 @@ protected function persist($key, $persist = TRUE) { * Resolves a cache miss. * * When an offset is not found in the object, this is treated as a cache - * miss. This method allows classes using this implementatio to look up the + * miss. This method allows classes using this implementation to look up the * actual value and allow it to be cached. * - * @param sring $key + * @param string $key * The offset that was requested. * * @return mixed diff --git a/core/lib/Drupal/Core/Cache/CacheContexts.php b/core/lib/Drupal/Core/Cache/CacheContexts.php index cbc2e9ef8f..7f7badc1fb 100644 --- a/core/lib/Drupal/Core/Cache/CacheContexts.php +++ b/core/lib/Drupal/Core/Cache/CacheContexts.php @@ -99,13 +99,13 @@ public function convertTokensToKeys(array $keys) { } /** - * Provides the string representaton of a cache context. + * Provides the string representation of a cache context. * * @param string $context * A cache context token of an available cache context service. * * @return string - * The string representaton of a cache context. + * The string representation of a cache context. */ protected function getContext($context) { return $this->getService($context)->getContext(); diff --git a/core/lib/Drupal/Core/Cache/ChainedFastBackend.php b/core/lib/Drupal/Core/Cache/ChainedFastBackend.php index 5a9ede4b34..f0b19869f2 100644 --- a/core/lib/Drupal/Core/Cache/ChainedFastBackend.php +++ b/core/lib/Drupal/Core/Cache/ChainedFastBackend.php @@ -16,7 +16,7 @@ * single web node, and will not require a network round trip to fetch a cache * item. The fast backend will also typically be inconsistent (will only see * changes from one web node). The slower backend will be something like Mysql, - * Mecached or Redis, and will be used by all web nodes, thus making it + * Memcached or Redis, and will be used by all web nodes, thus making it * consistent, but also require a network round trip for each cache get. * * In addition to being useful for sites running on multiple web nodes, this diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index 9386610103..448c63688e 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -220,7 +220,7 @@ public function setMultiple(array $items) { $transaction = $this->connection->startTransaction(); try { - // Delete all items first so we can do one insert. Rather than mulitple + // Delete all items first so we can do one insert. Rather than multiple // merge queries. $this->deleteMultiple(array_keys($items)); @@ -361,7 +361,7 @@ public function invalidate($cid) { } /** - * Implements Drupal\Core\Cache\CacheBackendInterface::invalideMultiple(). + * Implements Drupal\Core\Cache\CacheBackendInterface::invalidateMultiple(). */ public function invalidateMultiple(array $cids) { $cids = array_values(array_map(array($this, 'normalizeCid'), $cids)); diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php index a315eba3c1..b15498e9e0 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php @@ -59,7 +59,7 @@ public function setSyncing($status); * - Status does not affect the loading of entities. I.e. Disabling * configuration entities should only have UI/access implications. * - It should only take effect when a 'status' key is explicitly declared - * in the entity_keys info of a configuration entitys annotation data. + * in the entity_keys info of a configuration entity's annotation data. * - Each entity implementation (entity/controller) is responsible for * checking and managing the status. * diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php index 88af39e649..f404480150 100644 --- a/core/lib/Drupal/Core/Config/FileStorage.php +++ b/core/lib/Drupal/Core/Config/FileStorage.php @@ -139,7 +139,7 @@ public function write($name, array $data) { $target = $this->getFilePath($name); $status = @file_put_contents($target, $data); if ($status === FALSE) { - // Try to make sure the directory exists and try witing again. + // Try to make sure the directory exists and try writing again. $this->ensureStorage(); $status = @file_put_contents($target, $data); } diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php index 3072381675..c761a31c12 100644 --- a/core/lib/Drupal/Core/Config/StorageComparer.php +++ b/core/lib/Drupal/Core/Config/StorageComparer.php @@ -185,7 +185,7 @@ protected function addChangeList($collection, $op, array $changes, array $sort_o $this->changelist[$collection][$op] = array_merge($this->changelist[$collection][$op], $changes); if (isset($sort_order)) { $count = count($this->changelist[$collection][$op]); - // Sort the changlist in the same order as the $sort_order array and + // Sort the changelist in the same order as the $sort_order array and // ensure the array is keyed from 0. $this->changelist[$collection][$op] = array_values(array_intersect($sort_order, $this->changelist[$collection][$op])); if ($count != count($this->changelist[$collection][$op])) { diff --git a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php index f475c02810..d9ad30b1ad 100644 --- a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php +++ b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php @@ -80,7 +80,7 @@ public function create(DataDefinitionInterface $definition, $value, $name = NULL * The base type definition array, for which a data definition should be * created. * @param $value - * Optional value of the configuraiton element. + * Optional value of the configuration element. * @param string $name * Optional name of the configuration element. * @param object $parent diff --git a/core/lib/Drupal/Core/Controller/HtmlFormController.php b/core/lib/Drupal/Core/Controller/HtmlFormController.php index c7525b1569..5951b32daf 100644 --- a/core/lib/Drupal/Core/Controller/HtmlFormController.php +++ b/core/lib/Drupal/Core/Controller/HtmlFormController.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\Controler\HtmlFormController. + * Contains \Drupal\Core\Controller\HtmlFormController. */ namespace Drupal\Core\Controller; diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php index 7048e88be1..7cf2659a82 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php @@ -21,7 +21,7 @@ class Connection extends DatabaseConnection { /** - * The name by which to obtain a lock for retrive the next insert id. + * The name by which to obtain a lock for retrieve the next insert id. */ const POSTGRESQL_NEXTID_LOCK = 1000; @@ -88,7 +88,7 @@ public static function open(array &$connection_options = array()) { \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, // Prepared statements are most effective for performance when queries // are recycled (used several times). However, if they are not re-used, - // prepared statements become ineffecient. Since most of Drupal's + // prepared statements become inefficient. Since most of Drupal's // prepared queries are not re-used, it should be faster to emulate // the preparation than to actually ready statements for re-use. If in // doubt, reset to FALSE and measure performance. @@ -233,14 +233,14 @@ public function mapConditionOperator($operator) { } /** - * Retrive a the next id in a sequence. + * Retrieve a the next id in a sequence. * * PostgreSQL has built in sequences. We'll use these instead of inserting * and updating a sequences table. */ public function nextId($existing = 0) { - // Retrive the name of the sequence. This information cannot be cached + // Retrieve the name of the sequence. This information cannot be cached // because the prefix may change, for example, like it does in simpletests. $sequence_name = $this->makeSequenceName('sequences', 'value'); @@ -252,7 +252,7 @@ public function nextId($existing = 0) { } // PostgreSQL advisory locks are simply locks to be used by an - // application such as Drupal. This will prevent other Drupal proccesses + // application such as Drupal. This will prevent other Drupal processes // from altering the sequence while we are. $this->query("SELECT pg_advisory_lock(" . self::POSTGRESQL_NEXTID_LOCK . ")"); @@ -267,7 +267,7 @@ public function nextId($existing = 0) { // Reset the sequence to a higher value than the existing id. $this->query("ALTER SEQUENCE " . $sequence_name . " RESTART WITH " . ($existing + 1)); - // Retrive the next id. We know this will be as high as we want it. + // Retrieve the next id. We know this will be as high as we want it. $id = $this->query("SELECT nextval('" . $sequence_name . "')")->fetchField(); $this->query("SELECT pg_advisory_unlock(" . self::POSTGRESQL_NEXTID_LOCK . ")"); diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php index a5f0acdd53..e4e8d7ee3c 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php @@ -216,7 +216,7 @@ function initializeDatabase() { LANGUAGE \'sql\'' ); - // Using || to concatenate in Drupal is not recommeneded because there are + // Using || to concatenate in Drupal is not recommended because there are // database drivers for Drupal that do not support the syntax, however // they do support CONCAT(item1, item2) which we can replicate in // PostgreSQL. PostgreSQL requires the function to be defined for each diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php index 2a931ec558..4065964cd2 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php @@ -54,7 +54,7 @@ public function orderRandom() { public function orderBy($field, $direction = 'ASC') { // Call parent function to order on this. $return = parent::orderBy($field, $direction); - + if ($this->hasTag('entity_query')) { return $return; } @@ -88,7 +88,7 @@ public function orderBy($field, $direction = 'ASC') { } // If a table loads all fields, it can not be added again. It would - // result in an ambigious alias error because that field would be loaded + // result in an ambiguous alias error because that field would be loaded // twice: Once through table_alias.* and once directly. If the field // actually belongs to a different table, it must be added manually. foreach ($this->tables as $table) { @@ -98,7 +98,7 @@ public function orderBy($field, $direction = 'ASC') { } // If $field contains an characters which are not allowed in a field name - // it is considered an expression, these can't be handeld automatically + // it is considered an expression, these can't be handled automatically // either. if ($this->connection->escapeField($field) != $field) { return $return; diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php index dc09d86c1e..669a722ead 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php @@ -48,7 +48,7 @@ public function fieldExists($table, $column) { */ public function createTableSql($name, $table) { $sql = array(); - $sql[] = "CREATE TABLE {" . $name . "} (\n" . $this->createColumsSql($name, $table) . "\n);\n"; + $sql[] = "CREATE TABLE {" . $name . "} (\n" . $this->createColumnsSql($name, $table) . "\n);\n"; return array_merge($sql, $this->createIndexSql($name, $table)); } @@ -74,7 +74,7 @@ protected function createIndexSql($tablename, $schema) { /** * Build the SQL expression for creating columns. */ - protected function createColumsSql($tablename, $schema) { + protected function createColumnsSql($tablename, $schema) { $sql_array = array(); // Add the SQL statement for each field. @@ -249,8 +249,8 @@ public function renameTable($table, $new_name) { // SQLite doesn't allow you to rename tables outside of the current // database. So the syntax '...RENAME TO database.table' would fail. // So we must determine the full table name here rather than surrounding - // the table with curly braces incase the db_prefix contains a reference - // to a database outside of our existsing database. + // the table with curly braces in case the db_prefix contains a reference + // to a database outside of our existing database. $info = $this->getPrefixInfo($new_name); $this->connection->query('ALTER TABLE {' . $table . '} RENAME TO ' . $info['table']); diff --git a/core/lib/Drupal/Core/Database/InvalidQueryException.php b/core/lib/Drupal/Core/Database/InvalidQueryException.php index ffd5bab23c..412c5dfb55 100644 --- a/core/lib/Drupal/Core/Database/InvalidQueryException.php +++ b/core/lib/Drupal/Core/Database/InvalidQueryException.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Database; /** - * Exception thrown if a query would be invalidt. + * Exception thrown if a query would be invalid. * * This exception is thrown e.g. when trying to have an IN condition with an * empty array. diff --git a/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php b/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php index ffefd4b119..f7d3af9d89 100644 --- a/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php +++ b/core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Database\Query\FieldsOverlapExceptoin + * Definition of Drupal\Core\Database\Query\FieldsOverlapException */ namespace Drupal\Core\Database\Query; diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php index 6cdc6added..be71de3175 100644 --- a/core/lib/Drupal/Core/Database/Query/Merge.php +++ b/core/lib/Drupal/Core/Database/Query/Merge.php @@ -39,7 +39,7 @@ * MergeQuery::updateFields() and MergeQuery::insertFields() needs to be called * instead. MergeQuery::fields() can also be called which calls both of these * methods as the common case is to use the same column-value pairs for both - * INSERT and UPDATE. However, this is not mandatory. Another convinient + * INSERT and UPDATE. However, this is not mandatory. Another convenient * wrapper is MergeQuery::key() which adds the same column-value pairs to the * condition and the INSERT query part. * diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php index 2cee985795..6a1b0dd762 100644 --- a/core/lib/Drupal/Core/Database/Schema.php +++ b/core/lib/Drupal/Core/Database/Schema.php @@ -218,7 +218,7 @@ public function nextPlaceholder() { * Get information about the table name and schema from the prefix. * * @param - * Name of table to look prefix up for. Defaults to 'default' because thats + * Name of table to look prefix up for. Defaults to 'default' because that's * default key for prefix. * @param $add_prefix * Boolean that indicates whether the given table name should be prefixed. @@ -291,7 +291,7 @@ function prefixNonTable($table) { protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) { $info = $this->connection->getConnectionOptions(); - // Retrive the table name and schema + // Retrieve the table name and schema $table_info = $this->getPrefixInfo($table_name, $add_prefix); $condition = new Condition('AND'); diff --git a/core/lib/Drupal/Core/DependencyInjection/ClassResolverInterface.php b/core/lib/Drupal/Core/DependencyInjection/ClassResolverInterface.php index 7acfec10eb..09e65586bf 100644 --- a/core/lib/Drupal/Core/DependencyInjection/ClassResolverInterface.php +++ b/core/lib/Drupal/Core/DependencyInjection/ClassResolverInterface.php @@ -21,7 +21,7 @@ interface ClassResolverInterface { * A class name or service name. * * @throws \InvalidArgumentException - * If $class is not a valid service identifer and the class does not exist. + * If $class is not a valid service identifier and the class does not exist. * * @return object * The instance of the class. diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php index 9601f4d054..59a359177d 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php +++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php @@ -20,7 +20,7 @@ public function process(ContainerBuilder $container) { foreach ($container->findTaggedServiceIds('event_subscriber') as $id => $attributes) { - // We must assume that the class value has been correcly filled, even if the service is created by a factory + // We must assume that the class value has been correctly filled, even if the service is created by a factory $class = $container->getDefinition($id)->getClass(); $refClass = new \ReflectionClass($class); diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index c1069a17dd..19a0fa9865 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -381,7 +381,7 @@ public function boot() { if (!$this->sitePath) { throw new \Exception('Kernel does not have site path set before calling boot()'); } - // Intialize the container. + // Initialize the container. $this->initializeContainer(); // Ensure mt_rand() is reseeded to prevent random values from one page load diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index e8df9c88f6..2ad6d69fff 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -22,17 +22,17 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, ContentEntityInterface { /** - * Status code indentifying a removed translation. + * Status code identifying a removed translation. */ const TRANSLATION_REMOVED = 0; /** - * Status code indentifying an existing translation. + * Status code identifying an existing translation. */ const TRANSLATION_EXISTING = 1; /** - * Status code indentifying a newly created translation. + * Status code identifying a newly created translation. */ const TRANSLATION_CREATED = 2; @@ -95,7 +95,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C * An array of entity translation metadata. * * An associative array keyed by translation language code. Every value is an - * array containg the translation status and the translation object, if it has + * array containing the translation status and the translation object, if it has * already been instantiated. * * @var array diff --git a/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/core/lib/Drupal/Core/Entity/EntityResolverManager.php index 94b9aea469..f50e2b430b 100644 --- a/core/lib/Drupal/Core/Entity/EntityResolverManager.php +++ b/core/lib/Drupal/Core/Entity/EntityResolverManager.php @@ -121,7 +121,7 @@ protected function setParametersFromReflection($controller, Route $route) { $parameter_name = $parameter->getName(); // If the parameter name matches with an entity type try to set the // upcasting information automatically. Therefore take into account that - // the user has specified some interface, so the upasting is intended. + // the user has specified some interface, so the upcasting is intended. if (isset($entity_types[$parameter_name])) { $entity_type = $entity_types[$parameter_name]; $entity_class = $entity_type->getClass(); diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php index a46df01900..e88025c94a 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php @@ -533,7 +533,7 @@ protected function mapFromStorageRecords(array $records) { $entities[$id][$name][LanguageInterface::LANGCODE_DEFAULT] = $value; } } - // If we have no multilingual values we can instantiate entity objecs + // If we have no multilingual values we can instantiate entity objects // right now, otherwise we need to collect all the field values first. if (!$this->dataTable) { $bundle = $this->bundleKey ? $record->{$this->bundleKey} : FALSE; @@ -1076,7 +1076,7 @@ protected function saveRevision(EntityInterface $entity) { ->insert($this->revisionTable, array('return' => Database::RETURN_INSERT_ID)) ->fields((array) $record) ->execute(); - // Even if this is a new revsision, the revision ID key might have been + // Even if this is a new revision, the revision ID key might have been // set in which case we should not override the provided revision ID. if (!isset($record->{$this->revisionKey})) { $record->{$this->revisionKey} = $insert_id; @@ -1261,7 +1261,7 @@ protected function saveFieldItems(EntityInterface $entity, $update = TRUE) { $items = $entity->getTranslation($langcode)->get($field_name); $items->filterEmptyItems(); foreach ($items as $delta => $item) { - // We now know we have someting to insert. + // We now know we have something to insert. $do_insert = TRUE; $record = array( 'entity_id' => $id, diff --git a/core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php index cc260b6d33..8996b5dafe 100644 --- a/core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/AjaxSubscriber.php @@ -47,7 +47,7 @@ public function onResponse(FilterResponseEvent $event) { */ public static function getSubscribedEvents() { $events[KernelEvents::RESPONSE][] = array('onResponse', -100); - $events[KernelEvents::REQUEST][] = array('onREquest', 50); + $events[KernelEvents::REQUEST][] = array('onRequest', 50); return $events; } diff --git a/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php index 4f849258fc..43bdd8b5cf 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ContentFormControllerSubscriber.php @@ -55,7 +55,7 @@ public function __construct(ClassResolverInterface $class_resolver, ControllerRe } /** - * Sets the _controllere on a request based on the request format. + * Sets the _controller on a request based on the request format. * * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event * The event to process. diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php index 1dca1ee0b1..f882c2929e 100644 --- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php @@ -129,7 +129,7 @@ public function onRespond(FilterResponseEvent $event) { * @param \Symfony\Component\HttpFoundation\Response $response * * @return bool - * TRUE when Cache-Control header was set explicitely on the given response. + * TRUE when Cache-Control header was set explicitly on the given response. */ protected function isCacheControlCustomized(Response $response) { $cache_control = $response->headers->get('Cache-Control'); diff --git a/core/lib/Drupal/Core/Field/WidgetBase.php b/core/lib/Drupal/Core/Field/WidgetBase.php index 11663406d3..8bb24e9fb7 100644 --- a/core/lib/Drupal/Core/Field/WidgetBase.php +++ b/core/lib/Drupal/Core/Field/WidgetBase.php @@ -344,7 +344,7 @@ public function extractFormValues(FieldItemListInterface $items, array $form, Fo unset($values['add_more']); // The original delta, before drag-and-drop reordering, is needed to - // route errors to the corect form element. + // route errors to the correct form element. foreach ($values as $delta => &$value) { $value['_original_delta'] = $delta; } diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php index b737a54f53..d7b276836e 100644 --- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php @@ -43,7 +43,7 @@ public function guess($path) { } if ($this->sortedGuessers === NULL) { - // Sort is not trigerred yet. + // Sort is not triggered yet. $this->sortedGuessers = $this->sortGuessers(); } diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php index 0564398152..6fb6467484 100644 --- a/core/lib/Drupal/Core/Form/FormBuilder.php +++ b/core/lib/Drupal/Core/Form/FormBuilder.php @@ -112,7 +112,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS * The form validator. * @param \Drupal\Core\Form\FormSubmitterInterface $form_submitter * The form submission processor. - * @oaram \Drupal\Core\Form\FormCacheInterface $form_cache + * @param \Drupal\Core\Form\FormCacheInterface $form_cache * The form cache. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. diff --git a/core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php b/core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php index 4f5d57ee72..bc189d3b4a 100644 --- a/core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php +++ b/core/lib/Drupal/Core/Page/DefaultHtmlPageRenderer.php @@ -36,7 +36,7 @@ public function render(HtmlPage $page) { * Renders a page using a custom page theme hook and optional region content. * * Temporary shim to facilitate modernization progress for special front - * contollers (install.php, update.php, authorize.php), maintenance mode, and + * controllers (install.php, update.php, authorize.php), maintenance mode, and * the exception handler. * * Do NOT use this method in your code. This method will be removed as soon diff --git a/core/lib/Drupal/Core/Path/AliasManagerInterface.php b/core/lib/Drupal/Core/Path/AliasManagerInterface.php index 2338846baf..28d28f8245 100644 --- a/core/lib/Drupal/Core/Path/AliasManagerInterface.php +++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php @@ -39,7 +39,7 @@ public function getAliasByPath($path, $langcode = NULL); * Clear internal caches in alias manager. * * @param $source - * Source path of the alias that is being inserted/updated. Can be ommitted + * Source path of the alias that is being inserted/updated. Can be omitted * if entire cache needs to be flushed. */ public function cacheClear($source = NULL); diff --git a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php index 8d0b869b08..9d1bfa34b5 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php +++ b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php @@ -47,7 +47,7 @@ function __construct(ModuleHandlerInterface $module_handler, $hook) { } /** - * Implements Drupal\Component\Plugin\Discovery\DicoveryInterface::getDefinitions(). + * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions(). */ public function getDefinitions() { $definitions = array(); diff --git a/core/lib/Drupal/Core/Render/Element/MachineName.php b/core/lib/Drupal/Core/Render/Element/MachineName.php index fb57c5245d..ade389453c 100644 --- a/core/lib/Drupal/Core/Render/Element/MachineName.php +++ b/core/lib/Drupal/Core/Render/Element/MachineName.php @@ -133,7 +133,7 @@ public static function processMachineName(&$element, FormStateInterface $form_st } $element['#attributes'] += array('dir' => 'ltr'); - // The source element defaults to array('name'), but may have been overidden. + // The source element defaults to array('name'), but may have been overridden. if (empty($element['#machine_name']['source'])) { return $element; } diff --git a/core/lib/Drupal/Core/Render/Element/Table.php b/core/lib/Drupal/Core/Render/Element/Table.php index 29c8303640..d82fda8d1c 100644 --- a/core/lib/Drupal/Core/Render/Element/Table.php +++ b/core/lib/Drupal/Core/Render/Element/Table.php @@ -219,8 +219,8 @@ public static function processTable(&$element, FormStateInterface $form_state, & public static function validateTable(&$element, FormStateInterface $form_state, &$complete_form) { // Skip this validation if the button to submit the form does not require // selected table row data. - $trigerring_element = $form_state->getTriggeringElement(); - if (empty($trigerring_element['#tableselect'])) { + $triggering_element = $form_state->getTriggeringElement(); + if (empty($triggering_element['#tableselect'])) { return; } if ($element['#multiple']) { diff --git a/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php b/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php index 34f0ae5c42..1218fa6bed 100644 --- a/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php +++ b/core/lib/Drupal/Core/Routing/AcceptHeaderMatcher.php @@ -29,7 +29,7 @@ class AcceptHeaderMatcher implements RouteFilterInterface { /** * Constructs a new AcceptHeaderMatcher. * - * @param \Drupal\Core\ContentNegotiation $cotent_negotiation + * @param \Drupal\Core\ContentNegotiation $content_negotiation * The content negotiation library. */ public function __construct(ContentNegotiation $content_negotiation) { diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php index faa8456a5c..6be135365b 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -372,7 +372,7 @@ protected function processPath($path, &$options = array()) { } /** - * Passes the route to the processor manager for altering before complation. + * Passes the route to the processor manager for altering before compilation. * * @param \Symfony\Component\Routing\Route $route * The route object to process. diff --git a/core/lib/Drupal/Core/Session/AccountProxy.php b/core/lib/Drupal/Core/Session/AccountProxy.php index 89e9146d84..f9d0d350af 100644 --- a/core/lib/Drupal/Core/Session/AccountProxy.php +++ b/core/lib/Drupal/Core/Session/AccountProxy.php @@ -61,7 +61,7 @@ public function __construct(AuthenticationManagerInterface $authentication_manag * {@inheritdoc} */ public function setAccount(AccountInterface $account) { - // If the passed account is already proxyed, use the actual account instead + // If the passed account is already proxied, use the actual account instead // to prevent loops. if ($account instanceof static) { $account = $account->getAccount(); diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationManager.php b/core/lib/Drupal/Core/StringTranslation/TranslationManager.php index e6d2a6673f..8080d4b0e0 100644 --- a/core/lib/Drupal/Core/StringTranslation/TranslationManager.php +++ b/core/lib/Drupal/Core/StringTranslation/TranslationManager.php @@ -178,7 +178,7 @@ public function formatPlural($count, $singular, $plural, array $args = array(), } else { // If the index cannot be computed or there's no translation, use - // the second plural form as a fallback (which allows for most flexiblity + // the second plural form as a fallback (which allows for most flexibility // with the replaceable @count value). $return = $translated_array[1]; } diff --git a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php index c79ac3af3a..b88d8faee2 100644 --- a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php +++ b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php @@ -69,7 +69,7 @@ public function setActiveTheme(ActiveTheme $active_theme); /** * Passes alterable variables to specific $theme_TYPE_alter() implementations. * - * $theme specifices the theme name of the active theme and all its base + * $theme specifies the theme name of the active theme and all its base * themes. * * This dispatch function hands off the passed-in variables to type-specific diff --git a/core/lib/Drupal/Core/TypedData/TranslatableInterface.php b/core/lib/Drupal/Core/TypedData/TranslatableInterface.php index 4b028ff0e9..b8b966ee9e 100644 --- a/core/lib/Drupal/Core/TypedData/TranslatableInterface.php +++ b/core/lib/Drupal/Core/TypedData/TranslatableInterface.php @@ -61,7 +61,7 @@ public function getUntranslated(); * Returns TRUE there is a translation for the given language code. * * @param string $langcode - * The language code identifiying the translation. + * The language code identifying the translation. * * @return bool * TRUE if the translation exists, FALSE otherwise. -- GitLab