From b501becfe3a4bd2280e4b97be8660c349f1678ac Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Fri, 26 Jan 2024 14:52:06 +0000
Subject: [PATCH] Issue #3409362 by quietone, smustgrave: Fix spelling of some
words with 'un' prefix
---
composer/Plugin/Scaffold/Git.php | 2 ++
composer/Plugin/Scaffold/README.md | 2 +-
core/lib/Drupal/Core/Cache/CacheCollector.php | 2 +-
core/lib/Drupal/Core/Database/Database.php | 6 +++---
.../lib/Drupal/Core/Mail/MailFormatHelper.php | 2 +-
core/lib/Drupal/Core/Queue/Memory.php | 2 +-
core/lib/Drupal/Core/Render/Element/Link.php | 2 +-
core/misc/cspell/dictionary.txt | 21 -------------------
core/misc/tabledrag.js | 2 +-
.../FunctionalJavascript/ImageTestBase.php | 2 +-
.../filter/src/FilterFormatFormBase.php | 2 +-
.../Field/FieldType/LayoutSectionItem.php | 2 +-
.../src/Kernel/LocaleStringIsSafeTest.php | 4 ++--
.../tests/src/Functional/MenuUiNodeTest.php | 2 +-
.../src/Plugin/MigrateIdMapInterface.php | 2 +-
.../modules/path/src/PathAliasListBuilder.php | 2 +-
.../tests/src/Unit/AliasManagerTest.php | 4 ++--
.../EntityResource/EntityResourceTestBase.php | 4 ++--
.../tests/src/Kernel/SearchExcerptTest.php | 3 ++-
core/modules/update/update.api.php | 2 +-
core/modules/update/update.manager.inc | 2 +-
core/modules/user/src/UserInterface.php | 2 +-
core/modules/user/user.module | 2 +-
.../views/src/Plugin/views/query/Sql.php | 2 +-
.../src/Plugin/views/query/SqliteDateSql.php | 2 ++
.../Plugin/views/query/SqliteDateSqlTest.php | 2 ++
.../Template/ComposerProjectTemplatesTest.php | 2 +-
.../Tests/Component/Utility/XssTest.php | 2 +-
core/themes/claro/js/tableselect.js | 5 +++--
29 files changed, 39 insertions(+), 52 deletions(-)
diff --git a/composer/Plugin/Scaffold/Git.php b/composer/Plugin/Scaffold/Git.php
index c604b2741bd7..973b80c571e4 100644
--- a/composer/Plugin/Scaffold/Git.php
+++ b/composer/Plugin/Scaffold/Git.php
@@ -2,6 +2,8 @@
namespace Drupal\Composer\Plugin\Scaffold;
+// cspell:ignore unmatch
+
use Composer\IO\IOInterface;
use Composer\Util\ProcessExecutor;
diff --git a/composer/Plugin/Scaffold/README.md b/composer/Plugin/Scaffold/README.md
index 32bd25c37d90..b2c89da1e1b0 100644
--- a/composer/Plugin/Scaffold/README.md
+++ b/composer/Plugin/Scaffold/README.md
@@ -19,7 +19,7 @@ possible; for example, a project layout very similar to the current
[drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-scaffold)
template will also be provided. When one of these projects is used, the user
should be able to use `composer require` and `composer update` on a Drupal site
-immediately after untarring the downloaded archive.
+immediately after extracting the downloaded archive.
Note that the dependencies of a Drupal site are only able to scaffold files if
explicitly granted that right in the top-level composer.json file. See
diff --git a/core/lib/Drupal/Core/Cache/CacheCollector.php b/core/lib/Drupal/Core/Cache/CacheCollector.php
index 5250e1b049a7..e713d16a762e 100644
--- a/core/lib/Drupal/Core/Cache/CacheCollector.php
+++ b/core/lib/Drupal/Core/Cache/CacheCollector.php
@@ -187,7 +187,7 @@ public function delete($key) {
* The key that was requested.
* @param bool $persist
* (optional) Whether the offset should be persisted or not, defaults to
- * TRUE. When called with $persist = FALSE the offset will be unflagged so
+ * TRUE. When called with $persist = FALSE the offset will be un-flagged so
* that it will not be written at the end of the request.
*/
protected function persist($key, $persist = TRUE) {
diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php
index c641ac203ded..b7fd9ed419c4 100644
--- a/core/lib/Drupal/Core/Database/Database.php
+++ b/core/lib/Drupal/Core/Database/Database.php
@@ -11,9 +11,9 @@
/**
* Primary front-controller for the database system.
*
- * This class is uninstantiatable and un-extendable. It acts to encapsulate
- * all control and shepherding of database connections into a single location
- * without the use of globals.
+ * This class is un-extendable. It acts to encapsulate all control and
+ * shepherding of database connections into a single location without the use of
+ * globals.
*/
abstract class Database {
diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
index 7626736ad81f..87726dec3d86 100644
--- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php
+++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
@@ -308,7 +308,7 @@ protected static function wrapMailLine(&$line, $key, $values) {
}
}
if (!$line_is_mime_header) {
- // Use soft-breaks only for purely quoted or unindented text.
+ // Use soft-breaks only for purely quoted or un-indented text.
$line = wordwrap($line, 77 - $values['length'], $values['soft'] ? " \n" : "\n");
}
// Break really long words at the maximum width allowed.
diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php
index ba9d2494dbe7..a7e421a145f7 100644
--- a/core/lib/Drupal/Core/Queue/Memory.php
+++ b/core/lib/Drupal/Core/Queue/Memory.php
@@ -5,7 +5,7 @@
/**
* Static queue implementation.
*
- * This allows "undelayed" variants of processes relying on the Queue
+ * This allows "un-delayed" variants of processes relying on the Queue
* interface. The queue data resides in memory. It should only be used for
* items that will be queued and dequeued within a given page request.
*
diff --git a/core/lib/Drupal/Core/Render/Element/Link.php b/core/lib/Drupal/Core/Render/Element/Link.php
index adbd38584a23..b84a1b6ab5a4 100644
--- a/core/lib/Drupal/Core/Render/Element/Link.php
+++ b/core/lib/Drupal/Core/Render/Element/Link.php
@@ -112,7 +112,7 @@ public static function preRenderLink($element) {
*
* This method can be added as a pre_render callback for a renderable array,
* usually one which will be themed by links.html.twig. It iterates through
- * all unrendered children of the element, collects any #links properties it
+ * all un-rendered children of the element, collects any #links properties it
* finds, merges them into the parent element's #links array, and prevents
* those children from being rendered separately.
*
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index f64a551e1284..8785df0da9e1 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -884,8 +884,6 @@ typehints
tzid
uids
ulwa
-unaliased
-unallowed
unassigning
unassigns
unban
@@ -895,39 +893,24 @@ uncacheable
uncategorized
unclickable
uncollapsible
-unconfigured
-undelayed
undoable
-undraggable
-unextracted
unfieldable
-unflagged
ungenerated
ungroup
ungroupable
-unhashed
-unhides
-unindented
unindexed
uninstallation
uninstallations
-uninstantiatable
-uninstantiated
-unixepoch
-unkeyed
unmanaged
-unmatch
unminified
unmoderated
unparseable
-unpreloaded
unpromote
unpromoted
unpublish
unpublishes
unpublishing
unregisters
-unrendered
unrevisionable
unrouted
unsanitized
@@ -937,12 +920,8 @@ unserializes
unserializing
unsets
unsetting
-unshortened
-unsimplified
unsticky
untabbable
-untarring
-untrustable
unvalidated
unwrapper
upcasted
diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js
index c50de1ff3b84..7d261371449c 100644
--- a/core/misc/tabledrag.js
+++ b/core/misc/tabledrag.js
@@ -608,7 +608,7 @@
previousRow.matches('.draggable')
) {
// Swap with the previous row (unless previous row is the first
- // one and undraggable).
+ // one and un-draggable).
self.rowObject.swap('before', previousRow);
self.rowObject.interval = null;
self.rowObject.indent(0);
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
index 9cfabd27433f..a30b9ce9f655 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
@@ -125,7 +125,7 @@ public function testAttributeRetentionDuringUpcasting() {
"<p>$img_tag</p>",
$expected_upcast_behavior_when_wrapped_in_block_element === 'inline' ? "<p>$img_tag</p>" : $img_tag,
],
- // Image tag wrapped with an unallowed paragraph-like element (<div).
+ // Image tag wrapped with a disallowed paragraph-like element (<div).
// When inline is the expected upcast behavior, it will wrap in <p>
// because it still must wrap in a paragraph-like element, and <p> is
// available to be that element.
diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php
index 00e8bdf15792..7ff00b89de33 100644
--- a/core/modules/filter/src/FilterFormatFormBase.php
+++ b/core/modules/filter/src/FilterFormatFormBase.php
@@ -61,7 +61,7 @@ public function form(array $form, FormStateInterface $form_state) {
}
// Create filter plugin instances for all available filters, including both
- // enabled/configured ones as well as new and not yet unconfigured ones.
+ // enabled/configured ones as well as new and not yet configured ones.
$filters = $format->filters();
foreach ($filters as $filter_id => $filter) {
// When a filter is missing, it is replaced by the null filter. Remove it
diff --git a/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php b/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php
index 70acc59b3409..a132c8234cb2 100644
--- a/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php
+++ b/core/modules/layout_builder/src/Plugin/Field/FieldType/LayoutSectionItem.php
@@ -44,7 +44,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
*/
public function __get($name) {
// @todo \Drupal\Core\Field\FieldItemBase::__get() does not return default
- // values for uninstantiated properties. This will forcibly instantiate
+ // values for un-instantiated properties. This will forcibly instantiate
// all properties with the side-effect of a performance hit, resolve
// properly in https://www.drupal.org/node/2413471.
$this->getProperties();
diff --git a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php
index 75a3734e200f..9e47cbe1d606 100644
--- a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php
@@ -32,8 +32,8 @@ public function testLocaleStringIsSafe() {
$result = locale_string_is_safe($string);
$this->assertTrue($result);
- // Check an untranslatable string which includes untrustable HTML (according
- // to the locale_string_is_safe() function definition).
+ // Check an untranslatable string which includes unsafe HTML (according to
+ // the locale_string_is_safe() function definition).
$string = 'Hello <img src="world.png" alt="world" />!';
$result = locale_string_is_safe($string);
$this->assertFalse($result);
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index f0e757312fcc..6cdfc6900117 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -277,7 +277,7 @@ public function testMenuNodeFormWidget() {
// Assert that it is not possible to set the parent of the first node to itself or the second node.
$this->assertSession()->optionNotExists('edit-menu-menu-parent', 'tools:' . $item->getPluginId());
$this->assertSession()->optionNotExists('edit-menu-menu-parent', 'tools:' . $child_item->getPluginId());
- // Assert that unallowed Administration menu is not available in options.
+ // Assert that disallowed Administration menu is not available in options.
$this->assertSession()->optionNotExists('edit-menu-menu-parent', 'admin:');
}
diff --git a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
index e224dae4787d..569428d2759d 100644
--- a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
@@ -251,7 +251,7 @@ public function lookupSourceId(array $destination_id_values);
*
* @param array $source_id_values
* The source identifier keyed values of the records, e.g. ['nid' => 5].
- * If unkeyed, the first count($source_id_values) keys will be assumed.
+ * If un-keyed, the first count($source_id_values) keys will be assumed.
*
* @return array
* An array of arrays of destination identifier values.
diff --git a/core/modules/path/src/PathAliasListBuilder.php b/core/modules/path/src/PathAliasListBuilder.php
index 3b41c51c7d9c..76e9d47d5e35 100644
--- a/core/modules/path/src/PathAliasListBuilder.php
+++ b/core/modules/path/src/PathAliasListBuilder.php
@@ -171,7 +171,7 @@ public function buildRow(EntityInterface $entity) {
'#url' => $url,
];
- // Create a new URL for linking to the unaliased system path.
+ // Create a new URL for linking to the un-aliased system path.
$system_url = Url::fromUri("base:{$path}");
$row['data']['path']['data'] = [
'#type' => 'link',
diff --git a/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php b/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
index 2a52e3e719d4..0a2326fbe906 100644
--- a/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
+++ b/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
@@ -399,7 +399,7 @@ public function testGetAliasByPathCachedMissNoAlias() {
}
/**
- * Tests the getAliasByPath cache with an unpreloaded path without alias.
+ * Tests the getAliasByPath cache with an un-preloaded path without alias.
*
* @covers ::getAliasByPath
* @covers ::writeCache
@@ -483,7 +483,7 @@ public function testCacheClear() {
}
/**
- * Tests the getAliasByPath cache with an unpreloaded path with alias.
+ * Tests the getAliasByPath cache with an un-preloaded path with alias.
*
* @covers ::getAliasByPath
* @covers ::writeCache
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 3ad10537b5ac..23f2f5ba9188 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -451,14 +451,14 @@ public function testGet() {
$request_options[RequestOptions::HEADERS]['REST-test-auth'] = '1';
- // DX: 403 when attempting to use unallowed authentication provider.
+ // DX: 403 when attempting to use disallowed authentication provider.
$response = $this->request('GET', $url, $request_options);
$this->assertResourceErrorResponse(403, 'The used authentication method is not allowed on this route.', $response);
unset($request_options[RequestOptions::HEADERS]['REST-test-auth']);
$request_options[RequestOptions::HEADERS]['REST-test-auth-global'] = '1';
- // DX: 403 when attempting to use unallowed global authentication provider.
+ // DX: 403 when attempting to use disallowed global authentication provider.
$response = $this->request('GET', $url, $request_options);
$this->assertResourceErrorResponse(403, 'The used authentication method is not allowed on this route.', $response);
diff --git a/core/modules/search/tests/src/Kernel/SearchExcerptTest.php b/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
index 2c2bc79001ea..5fbf7562fd4d 100644
--- a/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
+++ b/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
@@ -72,7 +72,8 @@ public function testSearchExcerpt() {
*
* Excerpting should handle keywords that are matched only after going through
* text analysis. This test passes keywords that match simplified words
- * and compares them with strings that contain the original unsimplified word.
+ * and compares them with strings that contain the original un-simplified
+ * word.
*/
public function testSearchExcerptSimplified() {
$start_time = microtime(TRUE);
diff --git a/core/modules/update/update.api.php b/core/modules/update/update.api.php
index 18ff68f9d0c5..ba8617df4f94 100644
--- a/core/modules/update/update.api.php
+++ b/core/modules/update/update.api.php
@@ -110,7 +110,7 @@ function hook_update_status_alter(&$projects) {
* @param string $project
* The short name of the project that has been downloaded.
* @param string $archive_file
- * The filename of the unextracted archive.
+ * The filename of the un-extracted archive.
* @param string $directory
* The directory that the archive was extracted into.
*
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index ca44f20ad939..a0c2259661d6 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -193,7 +193,7 @@ function update_manager_archive_extract($file, $directory) {
* @param string $project
* The short name of the project to download.
* @param string $archive_file
- * The filename of the unextracted archive.
+ * The filename of the un-extracted archive.
* @param string $directory
* The directory that the archive was extracted into.
*
diff --git a/core/modules/user/src/UserInterface.php b/core/modules/user/src/UserInterface.php
index 51c7601a7923..bb69884c886c 100644
--- a/core/modules/user/src/UserInterface.php
+++ b/core/modules/user/src/UserInterface.php
@@ -107,7 +107,7 @@ public function getPassword();
* Sets the user password.
*
* @param string $password
- * The new unhashed password.
+ * The new un-hashed password.
*
* @return $this
* The called user entity.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index f68fabe0d41a..8ee98349b87c 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -382,7 +382,7 @@ function template_preprocess_username(&$variables) {
}
// Set the name to a formatted name that is safe for printing and
- // that won't break tables by being too long. Keep an unshortened,
+ // that won't break tables by being too long. Keep an un-shortened,
// unsanitized version, in case other preprocess functions want to implement
// their own shortening logic or add markup. If they do so, they must ensure
// that $variables['name'] is safe for printing.
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index c0f9c8867f21..af57e33ec48e 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -581,7 +581,7 @@ protected function markTable($table, $relationship, $alias) {
* table.
*
* @param $table
- * The unaliased name of the table to ensure.
+ * The un-aliased name of the table to ensure.
* @param $relationship
* The relationship to ensure the table links to. Each relationship will
* get a unique instance of the table being added. If not specified,
diff --git a/core/modules/views/src/Plugin/views/query/SqliteDateSql.php b/core/modules/views/src/Plugin/views/query/SqliteDateSql.php
index db7fc4a6cc09..b93b29ae356f 100644
--- a/core/modules/views/src/Plugin/views/query/SqliteDateSql.php
+++ b/core/modules/views/src/Plugin/views/query/SqliteDateSql.php
@@ -5,6 +5,8 @@
use Drupal\Core\Database\Connection;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+// cspell:ignore unixepoch
+
/**
* SQLite-specific date handling.
*
diff --git a/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php b/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php
index e2406750a793..b7bc31f0557d 100644
--- a/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/views/query/SqliteDateSqlTest.php
@@ -8,6 +8,8 @@
use Drupal\Tests\UnitTestCase;
use Drupal\views\Plugin\views\query\SqliteDateSql;
+// cspell:ignore unixepoch
+
/**
* Tests the MySQL-specific date query handler.
*
diff --git a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
index dc0285bf9f11..a3420045751c 100644
--- a/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
+++ b/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
@@ -251,7 +251,7 @@ public function testTemplateCreateProject($project, $package_dir, $docroot_dir)
$this->assertCommandSuccessful();
// Check the output of the project creation for the absence of warnings
// about any non-allowed composer plugins.
- // Note: There are different warnings for unallowed composer plugins
+ // Note: There are different warnings for disallowed composer plugins
// depending on running in non-interactive mode or not. It seems the Drupal
// CI environment always forces composer commands to run in the
// non-interactive mode. The only thing these messages have in common is the
diff --git a/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/core/tests/Drupal/Tests/Component/Utility/XssTest.php
index 2cf89d233e6a..0f242959ebee 100644
--- a/core/tests/Drupal/Tests/Component/Utility/XssTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/XssTest.php
@@ -567,7 +567,7 @@ public function providerTestAttributes() {
}
/**
- * Checks that \Drupal\Component\Utility\Xss::filterAdmin() correctly strips unallowed tags.
+ * Checks that \Drupal\Component\Utility\Xss::filterAdmin() correctly strips disallowed tags.
*/
public function testFilterXSSAdmin() {
$value = Xss::filterAdmin('<style /><iframe /><frame /><frameset /><meta /><link /><embed /><applet /><param /><layer />');
diff --git a/core/themes/claro/js/tableselect.js b/core/themes/claro/js/tableselect.js
index b4024384b6fe..1e26113703e5 100644
--- a/core/themes/claro/js/tableselect.js
+++ b/core/themes/claro/js/tableselect.js
@@ -123,8 +123,9 @@
'[data-drupal-table-row-spacer] { display: none; }';
if (!this.ignoreScrollEvent) {
- // Remove the timeout that unhides the spacer. If this function is called,
- // then scrolling is still happening and spacers should stay hidden.
+ // Remove the timeout that un-hides the spacer. If this function is
+ // called, then scrolling is still happening and spacers should stay
+ // hidden.
clearTimeout(this.scrollingTimeout);
// Shortly after scrolling tops, the spacer is re-added.
--
GitLab