From dbd0e756d8a0c3d220134d65ab5ba27dd249f779 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Wed, 16 Aug 2023 21:06:14 +0100
Subject: [PATCH] Issue #3185807 by andregp, quietone, lucienchalom, elber,
yogeshmpawar, jungle, Tauany Bueno, tmaiochi, xjm, smustgrave: Fix or ignore
some words starting with "w"
---
core/lib/Drupal/Core/Database/Query/Condition.php | 6 +++---
core/lib/Drupal/Core/Template/TwigPhpStorageCache.php | 6 +++---
core/misc/cspell/dictionary.txt | 6 ------
core/modules/file/file.module | 2 +-
.../tests/src/Functional/ImageStylesPathAndUrlTest.php | 4 ++--
core/modules/jsonapi/tests/src/Functional/TermTest.php | 2 +-
core/modules/system/system.install | 2 +-
.../tests/src/Functional/Rest/TermResourceTestBase.php | 2 +-
.../{WhosOnlineBlockTest.php => WhoIsOnlineBlockTest.php} | 4 ++--
.../tests/src/Functional/Plugin/DisplayPageWebTest.php | 2 +-
10 files changed, 15 insertions(+), 21 deletions(-)
rename core/modules/user/tests/src/Kernel/{WhosOnlineBlockTest.php => WhoIsOnlineBlockTest.php} (97%)
diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php
index 616255db2f76..f0f71aed610e 100644
--- a/core/lib/Drupal/Core/Database/Query/Condition.php
+++ b/core/lib/Drupal/Core/Database/Query/Condition.php
@@ -258,9 +258,9 @@ public function compile(Connection $connection, PlaceholderInterface $queryPlace
$this->stringVersion = '( AND 1 = 0 )';
// Conceptually throwing an exception caused by user input is bad
- // as you result into a WSOD, which depending on your webserver
- // configuration can result into the assumption that your site is
- // broken.
+ // as you result into a 'white screen of death', which depending on
+ // your webserver configuration can result into the assumption that
+ // your site is broken.
// On top of that the database API relies on __toString() which
// does not allow to throw exceptions.
trigger_error('Invalid characters in query operator: ' . $condition['operator'], E_USER_ERROR);
diff --git a/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php b/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
index 89a7a7522e4d..23c6decaeb86 100644
--- a/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
+++ b/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
@@ -10,9 +10,9 @@
/**
* Provides an alternate cache storage for Twig using PhpStorage.
*
- * This class is designed to work on setups with multiple webheads using a local
- * filesystem for the twig cache. When generating the cache key, a hash value
- * depending on the enabled extensions is included. This prevents stale
+ * This class is designed to work on setups with multiple web heads using a
+ * local filesystem for the twig cache. When generating the cache key, a hash
+ * value depending on the enabled extensions is included. This prevents stale
* templates from being reused when twig extensions are enabled or disabled.
*
* @see \Drupal\Core\DependencyInjection\Compiler\TwigExtensionPass
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index ec6dd524716f..a4cd7d4c83f0 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -1341,7 +1341,6 @@ wcprops
webassert
webcal
webflo
-webheads
webhosting
webmention
webmozart
@@ -1350,19 +1349,14 @@ webroot
webservers
webtest
whitespaces
-whos
widthx
-wimoids
wmet
wmlscript
wordprocessingml
wordsafe
wordword
workspaceswitcher
-writability
writeln
-wrongparam
-wsod
wwwrun
xbap
xbitmap
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 3a6de2031a9e..220ec88bc47e 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -34,7 +34,7 @@
use Symfony\Component\HttpFoundation\File\Exception\NoFileException;
use Symfony\Component\HttpFoundation\File\Exception\PartialFileException;
-// cspell:ignore abiword
+// cspell:ignore abiword widthx
/**
* Implements hook_help().
diff --git a/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php b/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
index 9926f8c9d2cd..40184001c5b9 100644
--- a/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
@@ -187,7 +187,7 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
$this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
$this->assertSession()->statusCodeEquals(404);
// Change the parameter name so the token is missing.
- $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
+ $this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrong_parameter=', $generate_url));
$this->assertSession()->statusCodeEquals(404);
// Check that the generated URL is the same when we pass in a relative path
@@ -306,7 +306,7 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
$nested_url = $this->style->buildUrl($generated_uri, $clean_url);
$matches_expected_url_format = (boolean) preg_match('/styles\/' . $this->style->id() . '\/' . $scheme . '\/styles\/' . $this->style->id() . '\/' . $scheme . '/', $nested_url);
$this->assertTrue($matches_expected_url_format, "URL for a derivative of an image style matches expected format.");
- $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
+ $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrong_parameter=', $nested_url);
$this->drupalGet($nested_url_with_wrong_token);
$this->assertSession()->statusCodeEquals(404);
// Check that this restriction cannot be bypassed by adding extra slashes
diff --git a/core/modules/jsonapi/tests/src/Functional/TermTest.php b/core/modules/jsonapi/tests/src/Functional/TermTest.php
index 6638c3821c89..77acd0062942 100644
--- a/core/modules/jsonapi/tests/src/Functional/TermTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/TermTest.php
@@ -464,7 +464,7 @@ public function testGetIndividualTermWithParent(array $parent_term_ids) {
->setName('Lamoids')
->save();
Term::create(['vid' => Vocabulary::load('camelids')->id()])
- ->setName('Wimoids')
+ ->setName('Camels')
->save();
// Modify the entity under test to use the provided parent terms.
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index fae06ecc2724..5684accadf2f 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -640,7 +640,7 @@ function system_requirements($phase) {
}
}
- // Test configuration files and directory for writability.
+ // Test if configuration files and directory are writable.
if ($phase == 'runtime') {
$conf_errors = [];
// Find the site path. Kernel service is not always available at this point,
diff --git a/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php b/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
index 16f1d3734e74..76ddf9026c97 100644
--- a/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
@@ -337,7 +337,7 @@ public function testGetTermWithParent(array $parent_term_ids) {
->setName('Lamoids')
->save();
Term::create(['vid' => Vocabulary::load('camelids')->id()])
- ->setName('Wimoids')
+ ->setName('Camels')
->save();
// Modify the entity under test to use the provided parent terms.
diff --git a/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php b/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
similarity index 97%
rename from core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
rename to core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
index 4f96e0f3ab32..ec84fcfacfbf 100644
--- a/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
+++ b/core/modules/user/tests/src/Kernel/WhoIsOnlineBlockTest.php
@@ -11,7 +11,7 @@
*
* @group user
*/
-class WhosOnlineBlockTest extends KernelTestBase {
+class WhoIsOnlineBlockTest extends KernelTestBase {
/**
* {@inheritdoc}
@@ -71,7 +71,7 @@ protected function setUp(): void {
/**
* Tests the Who's Online block.
*/
- public function testWhosOnlineBlock() {
+ public function testWhoIsOnlineBlock() {
$request_time = \Drupal::time()->getRequestTime();
// Generate users.
$user1 = User::create([
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
index 1cc6c9f0cd99..b2ca2f10315e 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
@@ -7,7 +7,7 @@
use Drupal\views\Views;
/**
- * Tests the views page display plugin as webtest.
+ * Tests the views page display plugin.
*
* @group views
*/
--
GitLab