From 0b70058e0fd14dd4d5e9d392cc5c876d29548e23 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Thu, 8 Feb 2024 09:21:36 +0000
Subject: [PATCH] Issue #3417566 by quietone, smustgrave, longwave: Correct
more words in comments plus pathnames
---
core/INSTALL.mysql.txt | 10 +++++-----
core/INSTALL.pgsql.txt | 4 ++--
core/assets/scaffold/files/default.settings.php | 8 ++++----
core/assets/scaffold/files/example.sites.php | 2 +-
core/lib/Drupal.php | 2 +-
.../Component/Utility/HtmlSerializerRules.php | 2 ++
.../Drupal/Core/Access/CsrfTokenGenerator.php | 4 ++--
core/lib/Drupal/Core/Database/Install/Tasks.php | 2 +-
.../Transaction/TransactionManagerBase.php | 10 +++++-----
core/lib/Drupal/Core/DrupalKernel.php | 2 +-
core/lib/Drupal/Core/Entity/EntityForm.php | 2 +-
.../Drupal/Core/Extension/DatabaseDriverList.php | 4 ++--
core/lib/Drupal/Core/Extension/ExtensionList.php | 16 ++++++++--------
.../Drupal/Core/Installer/ExtensionListTrait.php | 2 +-
.../Render/HtmlResponseAttachmentsProcessor.php | 2 ++
core/lib/Drupal/Core/Routing/RouteProvider.php | 2 ++
core/lib/Drupal/Core/Test/TestDiscovery.php | 6 +++---
core/lib/Drupal/Core/Update/UpdateRegistry.php | 2 ++
core/misc/ajax.js | 4 ++--
core/misc/cspell/dictionary.txt | 16 ----------------
.../tests/src/Functional/TranslationWebTest.php | 2 +-
.../field/tests/src/Kernel/TranslationTest.php | 4 ++--
core/modules/field_ui/src/FieldUI.php | 2 +-
core/modules/jsonapi/jsonapi.api.php | 2 +-
.../tests/src/Kernel/MediaTranslationTest.php | 2 +-
.../modules/media_library/js/media_library.ui.js | 2 +-
.../EntityReferenceWidgetTest.php | 2 +-
.../src/Driver/Database/mysql/Install/Tasks.php | 2 ++
core/modules/system/system.install | 2 +-
.../tour/tests/src/Functional/TourTestBase.php | 2 +-
.../tests/src/Unit/Plugin/query/SqlTest.php | 2 +-
core/phpunit.xml.dist | 2 +-
core/scripts/run-tests.sh | 2 +-
.../TestSite/Commands/TestSiteInstallCommand.php | 2 +-
.../Commands/TestSiteTearDownCommand.php | 2 +-
.../Component/Utility/ArgumentsResolverTest.php | 2 +-
.../Core/DrupalKernel/ValidateHostnameTest.php | 2 +-
.../Tests/Core/Extension/ExtensionListTest.php | 10 +++++-----
.../Drupal/Tests/Core/Path/PathValidatorTest.php | 2 +-
sites/default/default.settings.php | 8 ++++----
sites/example.sites.php | 2 +-
41 files changed, 77 insertions(+), 83 deletions(-)
diff --git a/core/INSTALL.mysql.txt b/core/INSTALL.mysql.txt
index 95a873433350..71401557152a 100644
--- a/core/INSTALL.mysql.txt
+++ b/core/INSTALL.mysql.txt
@@ -7,10 +7,10 @@ by your host). In the following examples, 'username' is an example MySQL user
which has the CREATE and GRANT privileges. Use the appropriate user name for
your system.
-First, you must create a new database for your Drupal site (here, 'databasename'
-is the name of the new database):
+First, you must create a new database for your Drupal site (here,
+'database_name' is the name of the new database):
- mysqladmin -u username -p create databasename
+ mysqladmin -u username -p create database_name
MySQL will prompt for the 'username' database password and then create the
initial database files. Next you must log in and set the access database rights:
@@ -21,12 +21,12 @@ Again, you will be asked for the 'username' database password. At the MySQL
prompt, enter the following command:
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
- CREATE TEMPORARY TABLES ON databasename.*
+ CREATE TEMPORARY TABLES ON database_name.*
TO 'username'@'localhost' IDENTIFIED BY 'password';
where:
- 'databasename' is the name of your database
+ 'database_name' is the name of your database
'username' is the username of your MySQL account
'localhost' is the web server host where Drupal is installed
'password' is the password required for that username
diff --git a/core/INSTALL.pgsql.txt b/core/INSTALL.pgsql.txt
index 8fe80433bd67..c32e8e613c44 100644
--- a/core/INSTALL.pgsql.txt
+++ b/core/INSTALL.pgsql.txt
@@ -19,10 +19,10 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
This step is only necessary if you don't already have a database set up
(e.g., by your host) or want to create a new database for use with Drupal
- only. The following command creates a new database named 'databasename',
+ only. The following command creates a new database named 'database_name',
which is owned by the previously created 'username':
- createdb --encoding=UTF8 --owner=username databasename
+ createdb --encoding=UTF8 --owner=username database_name
If there are no errors, then the command was successful.
diff --git a/core/assets/scaffold/files/default.settings.php b/core/assets/scaffold/files/default.settings.php
index 98b25a83581d..9c876acbfff5 100644
--- a/core/assets/scaffold/files/default.settings.php
+++ b/core/assets/scaffold/files/default.settings.php
@@ -77,7 +77,7 @@
*
* @code
* $databases['default']['default'] = [
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -193,7 +193,7 @@
* @code
* $databases['default']['default'] = [
* 'driver' => 'pgsql',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -215,7 +215,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -230,7 +230,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
diff --git a/core/assets/scaffold/files/example.sites.php b/core/assets/scaffold/files/example.sites.php
index 3b32b5aba169..35995136d3fe 100644
--- a/core/assets/scaffold/files/example.sites.php
+++ b/core/assets/scaffold/files/example.sites.php
@@ -7,7 +7,7 @@
* Configuration file for multi-site support and directory aliasing feature.
*
* This file is required for multi-site support and also allows you to define a
- * set of aliases that map hostnames, ports, and pathnames to configuration
+ * set of aliases that map host names, ports, and path names to configuration
* directories in the sites directory. These aliases are loaded prior to
* scanning for directories, and they are exempt from the normal discovery
* rules. See default.settings.php to view how Drupal discovers the
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 7fccfaa3fac0..99db2aec8453 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -346,7 +346,7 @@ public static function cache($bin = 'default') {
* an object of a class that implements
* \Drupal\Core\DependencyInjection\ContainerInjectionInterface.
*
- * One common usecase is to provide a class which contains the actual code
+ * One common use case is to provide a class which contains the actual code
* of a hook implementation, without having to create a service.
*
* @param string $class
diff --git a/core/lib/Drupal/Component/Utility/HtmlSerializerRules.php b/core/lib/Drupal/Component/Utility/HtmlSerializerRules.php
index 3559850053d6..d48db59a4e1a 100644
--- a/core/lib/Drupal/Component/Utility/HtmlSerializerRules.php
+++ b/core/lib/Drupal/Component/Utility/HtmlSerializerRules.php
@@ -6,6 +6,8 @@
use Masterminds\HTML5\Serializer\OutputRules;
+// cspell:ignore drupalhtmlbuilder
+
/**
* Drupal-specific HTML5 serializer rules.
*
diff --git a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
index d19031747430..81cb1f29aa66 100644
--- a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
+++ b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
@@ -87,8 +87,8 @@ public function validate($token, $value = '') {
return FALSE;
}
$value = $this->computeToken($seed, $value);
- // PHP 8.0 strictly typehints for hash_equals. Maintain BC until we can
- // enforce scalar typehints on this method.
+ // PHP 8.0 strictly type hints for hash_equals. Maintain BC until we can
+ // enforce scalar type hints on this method.
if (!is_string($token)) {
return FALSE;
}
diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php
index c6debf27856a..cedd550ca40d 100644
--- a/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -313,7 +313,7 @@ public function getFormOptions(array $database) {
'#title' => t('Host'),
'#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
'#size' => 45,
- // Hostnames can be 255 characters long.
+ // Host names can be 255 characters long.
'#maxlength' => 255,
'#required' => TRUE,
];
diff --git a/core/lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php b/core/lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php
index 34bb51689dc4..7aa66fac0b40 100644
--- a/core/lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php
+++ b/core/lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php
@@ -33,11 +33,11 @@ abstract class TransactionManagerBase implements TransactionManagerInterface {
* additional savepoints, and release any savepoint in the sequence. When
* this happens, the database will implicitly release all the savepoints
* created after the one released. Given Drupal implementation of the
- * Transaction objects, we cannot force descoping of the corresponding
- * Transaction savepoint objects from the manager, because they live in the
- * scope of the calling code. This stack ensures that when an outlived
- * Transaction object gets out of scope, it will not try to release on the
- * database a savepoint that no longer exists.
+ * Transaction objects, we cannot force reducing the scope of the
+ * corresponding Transaction savepoint objects from the manager, because they
+ * live in the scope of the calling code. This stack ensures that when an
+ * outlived Transaction object gets out of scope, it will not try to release
+ * on the database a savepoint that no longer exists.
*
* Differently, rollbacks are strictly being checked for LIFO order: if a
* rollback is requested against a savepoint that is not the last created,
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 6c1a8e1bbaa4..b79aee7716f7 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -189,7 +189,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
protected $containerNeedsDumping;
/**
- * List of discovered services.yml pathnames.
+ * List of discovered services.yml path names.
*
* This is a nested array whose top-level keys are 'app' and 'site', denoting
* the origin of a service provider. Site-specific providers have to be
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 18a70a62dfb7..6e3043bd1d96 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -62,7 +62,7 @@ public function setOperation($operation) {
* {@inheritdoc}
*/
public function getBaseFormId() {
- // Assign ENTITYTYPE_form as base form ID to invoke corresponding
+ // Assign ENTITY_TYPE_form as base form ID to invoke corresponding
// hook_form_alter(), #validate, #submit, and #theme callbacks, but only if
// it is different from the actual form ID, since callbacks would be invoked
// twice otherwise.
diff --git a/core/lib/Drupal/Core/Extension/DatabaseDriverList.php b/core/lib/Drupal/Core/Extension/DatabaseDriverList.php
index 3126faf2e35b..809403b31f8d 100644
--- a/core/lib/Drupal/Core/Extension/DatabaseDriverList.php
+++ b/core/lib/Drupal/Core/Extension/DatabaseDriverList.php
@@ -204,14 +204,14 @@ protected function recalculateInfo() {
/**
* {@inheritdoc}
*/
- public function getPathnames() {
+ public function getPathNames() {
throw new \LogicException(__METHOD__ . '() is not implemented');
}
/**
* {@inheritdoc}
*/
- protected function recalculatePathnames() {
+ protected function recalculatePathNames() {
throw new \LogicException(__METHOD__ . '() is not implemented');
}
diff --git a/core/lib/Drupal/Core/Extension/ExtensionList.php b/core/lib/Drupal/Core/Extension/ExtensionList.php
index 38f0f9f82466..6f4c4b7c3ac3 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionList.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionList.php
@@ -170,14 +170,14 @@ public function reset() {
$this->pathNames = NULL;
try {
- $this->state->delete($this->getPathnamesCacheId());
+ $this->state->delete($this->getPathNamesCacheId());
}
catch (DatabaseExceptionWrapper $e) {
// Ignore exceptions caused by a non existing {key_value} table in the
// early installer.
}
- $this->cache->delete($this->getPathnamesCacheId());
+ $this->cache->delete($this->getPathNamesCacheId());
// @todo In the long run it would be great to add the reset, but the early
// installer fails due to that. https://www.drupal.org/node/2719315 could
// help to resolve with that.
@@ -210,7 +210,7 @@ protected function getInfoCacheId() {
* @return string
* The filename cache ID.
*/
- protected function getPathnamesCacheId() {
+ protected function getPathNamesCacheId() {
return "system.{$this->type}.files";
}
@@ -413,15 +413,15 @@ protected function recalculateInfo() {
*
* @return string[]
*/
- public function getPathnames() {
+ public function getPathNames() {
if ($this->pathNames === NULL) {
- $cache_id = $this->getPathnamesCacheId();
+ $cache_id = $this->getPathNamesCacheId();
if ($cache = $this->cache->get($cache_id)) {
$path_names = $cache->data;
}
// We use $file_names below.
elseif (!$path_names = $this->state->get($cache_id)) {
- $path_names = $this->recalculatePathnames();
+ $path_names = $this->recalculatePathNames();
// Store filenames to allow static::getPathname() to retrieve them
// without having to rebuild or scan the filesystem.
$this->state->set($cache_id, $path_names);
@@ -438,7 +438,7 @@ public function getPathnames() {
* @return string[]
* An array of .info.yml file locations keyed by the extension machine name.
*/
- protected function recalculatePathnames() {
+ protected function recalculatePathNames() {
$extensions = $this->getList();
ksort($extensions);
@@ -518,7 +518,7 @@ public function getPathname($extension_name) {
elseif (isset($this->pathNames[$extension_name])) {
return $this->pathNames[$extension_name];
}
- elseif (($path_names = $this->getPathnames()) && isset($path_names[$extension_name])) {
+ elseif (($path_names = $this->getPathNames()) && isset($path_names[$extension_name])) {
return $path_names[$extension_name];
}
throw new UnknownExtensionException("The {$this->type} $extension_name does not exist.");
diff --git a/core/lib/Drupal/Core/Installer/ExtensionListTrait.php b/core/lib/Drupal/Core/Installer/ExtensionListTrait.php
index bbfae1fe09c6..29c80811a5af 100644
--- a/core/lib/Drupal/Core/Installer/ExtensionListTrait.php
+++ b/core/lib/Drupal/Core/Installer/ExtensionListTrait.php
@@ -43,7 +43,7 @@ public function getPathname($extension_name) {
elseif (isset(static::$staticAddedPathNames[$extension_name])) {
return static::$staticAddedPathNames[$extension_name];
}
- elseif (($path_names = $this->getPathnames()) && isset($path_names[$extension_name])) {
+ elseif (($path_names = $this->getPathNames()) && isset($path_names[$extension_name])) {
// Ensure we don't have to do path scanning more than really needed.
foreach ($path_names as $extension => $path_name) {
static::$staticAddedPathNames[$extension] = $path_name;
diff --git a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
index fd2d1ff0429e..a768b0b8978c 100644
--- a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
+++ b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
@@ -2,6 +2,8 @@
namespace Drupal\Core\Render;
+// cspell:ignore turbolinks
+
use Drupal\Core\Asset\AssetCollectionRendererInterface;
use Drupal\Core\Asset\AssetResolverInterface;
use Drupal\Core\Asset\AttachedAssets;
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 8f11bb00a2dd..7c5b7e9e0faa 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -16,6 +16,8 @@
use Symfony\Component\Routing\RouteCollection;
use Drupal\Core\Database\Connection;
+// cspell:ignore filesort
+
/**
* A Route Provider front-end for all Drupal-stored routes.
*/
diff --git a/core/lib/Drupal/Core/Test/TestDiscovery.php b/core/lib/Drupal/Core/Test/TestDiscovery.php
index d6e2336375f8..16c551ed06e3 100644
--- a/core/lib/Drupal/Core/Test/TestDiscovery.php
+++ b/core/lib/Drupal/Core/Test/TestDiscovery.php
@@ -163,7 +163,7 @@ public function getTestClasses($extension = NULL, array $types = []) {
// Prevent expensive class loader lookups for each reflected test class by
// registering the complete classmap of test classes to the class loader.
// This also ensures that test classes are loaded from the discovered
- // pathnames; a namespace/classname mismatch will throw an exception.
+ // path names; a namespace/classname mismatch will throw an exception.
$this->classLoader->addClassMap($classmap);
foreach ($classmap as $classname => $pathname) {
@@ -213,7 +213,7 @@ public function getTestClasses($extension = NULL, array $types = []) {
*
* @return array
* A classmap containing all discovered class files; i.e., a map of
- * fully-qualified classnames to pathnames.
+ * fully-qualified classnames to path names.
*/
public function findAllClassFiles($extension = NULL) {
$classmap = [];
@@ -247,7 +247,7 @@ public function findAllClassFiles($extension = NULL) {
*
* @return array
* An associative array whose keys are fully-qualified class names and whose
- * values are corresponding filesystem pathnames.
+ * values are corresponding filesystem path names.
*
* @throws \InvalidArgumentException
* If $namespace_prefix does not end in a namespace separator (backslash).
diff --git a/core/lib/Drupal/Core/Update/UpdateRegistry.php b/core/lib/Drupal/Core/Update/UpdateRegistry.php
index 4db46fc36933..f9a0b85a0633 100644
--- a/core/lib/Drupal/Core/Update/UpdateRegistry.php
+++ b/core/lib/Drupal/Core/Update/UpdateRegistry.php
@@ -9,6 +9,8 @@
use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+// cspell:ignore updatetype
+
/**
* Provides all and missing update implementations.
*
diff --git a/core/misc/ajax.js b/core/misc/ajax.js
index ae1df4b9ed40..4f1cf028606d 100644
--- a/core/misc/ajax.js
+++ b/core/misc/ajax.js
@@ -724,7 +724,7 @@
* The Ajax object will, if instructed, bind to a key press response. This
* will test to see if the key press is valid to trigger this event and
* if it is, trigger it for us and prevent other keypresses from triggering.
- * In this case we're handling RETURN and SPACEBAR keypresses (event codes 13
+ * In this case we're handling RETURN and SPACE BAR keypresses (event codes 13
* and 32. RETURN is often used to submit a form when in a textfield, and
* SPACE is often used to activate an element without submitting.
*
@@ -739,7 +739,7 @@
// Detect enter key and space bar and allow the standard response for them,
// except for form elements of type 'text', 'tel', 'number' and 'textarea',
- // where the spacebar activation causes inappropriate activation if
+ // where the space bar activation causes inappropriate activation if
// #ajax['keypress'] is TRUE. On a text-type widget a space should always
// be a space.
if (
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 824b4affecb6..8f9a117af00a 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -178,7 +178,6 @@ customevent
customrequest
cweagans
dailymotion
-databasename
datelist
daterange
datestamp
@@ -204,7 +203,6 @@ desaturate
desaturated
desaturates
desaturating
-descoping
destructable
devel
deviantart
@@ -257,7 +255,6 @@ endmacro
endset
endtrans
enoki
-entitytype
entityviewedit
errmode
etag
@@ -293,7 +290,6 @@ fieldlinks
fieldnames
fieldsets
filemime
-filesort
filesystems
filetransfer
findwith
@@ -339,7 +335,6 @@ hmac
hoglet
hookname
hosters
-hostnames
hrefs
htkey
htmlcorrector
@@ -379,7 +374,6 @@ johansson
jqueryui
jsonlint
jssdk
-jumplinks
justinrainbow
kangarookitten
kernighan
@@ -397,7 +391,6 @@ kword
lamoids
languageswitcher
libc
-libmysqlclient
licious
lified
lightninggreen
@@ -478,7 +471,6 @@ multibyte
multicardinality
multifield
multilanguage
-multipage
multipass
multisite
multistar
@@ -494,7 +486,6 @@ namespacing
navs
ndocs
necolas
-negotiatiors
newcol
newfieldinitial
newnode
@@ -559,7 +550,6 @@ parseable
parsererror
pastafazoul
pathauto
-pathnames
pcre
pcss
peast
@@ -718,7 +708,6 @@ smalldatetime
somecompany
sortablejs
sourceediting
-spacebar
specialchars
spiffiness
splitbutton
@@ -863,12 +852,9 @@ trgm
trid
troopal
truecolor
-turbolinks
twistie
twocol
typehint
-typehinted
-typehints
tzid
uids
ulwa
@@ -903,12 +889,10 @@ untabbable
upcasted
upcasting
updateprogress
-updatetype
uploaders
uploadprogress
upscaling
urandom
-usecase
userid
userinfo
userref
diff --git a/core/modules/field/tests/src/Functional/TranslationWebTest.php b/core/modules/field/tests/src/Functional/TranslationWebTest.php
index 71a5cee4fb49..63b0b82056f1 100644
--- a/core/modules/field/tests/src/Functional/TranslationWebTest.php
+++ b/core/modules/field/tests/src/Functional/TranslationWebTest.php
@@ -7,7 +7,7 @@
use Drupal\language\Entity\ConfigurableLanguage;
/**
- * Tests multilanguage fields logic that require a full environment.
+ * Tests multilingual fields logic that require a full environment.
*
* @group field
*/
diff --git a/core/modules/field/tests/src/Kernel/TranslationTest.php b/core/modules/field/tests/src/Kernel/TranslationTest.php
index f6308cc0a7a2..d6f3b4bdea5d 100644
--- a/core/modules/field/tests/src/Kernel/TranslationTest.php
+++ b/core/modules/field/tests/src/Kernel/TranslationTest.php
@@ -7,9 +7,9 @@
use Drupal\field\Entity\FieldStorageConfig;
/**
- * Tests multilanguage fields logic.
+ * Tests multilingual fields logic.
*
- * The following tests will check the multilanguage logic in field handling.
+ * The following tests will check the multilingual logic in field handling.
*
* @group field
*/
diff --git a/core/modules/field_ui/src/FieldUI.php b/core/modules/field_ui/src/FieldUI.php
index 0d5d7771dc30..616012d6a788 100644
--- a/core/modules/field_ui/src/FieldUI.php
+++ b/core/modules/field_ui/src/FieldUI.php
@@ -30,7 +30,7 @@ public static function getOverviewRouteInfo($entity_type_id, $bundle) {
}
/**
- * Returns the next redirect path in a multipage sequence.
+ * Returns the next redirect path in a multi-page sequence.
*
* @param array $destinations
* An array of destinations to redirect to.
diff --git a/core/modules/jsonapi/jsonapi.api.php b/core/modules/jsonapi/jsonapi.api.php
index 208b169bbe93..4c024f814bcc 100644
--- a/core/modules/jsonapi/jsonapi.api.php
+++ b/core/modules/jsonapi/jsonapi.api.php
@@ -98,7 +98,7 @@
* revision ID. The `rel` negotiator takes a version argument which is either
* the string `latest-version` or the string `working-copy`.
*
- * In the future, other negotiatiors may be developed, such as negotiatiors that
+ * In the future, other negotiators may be developed, such as negotiators that
* are UUID-, timestamp-, or workspace-based.
*
* To illustrate how a particular entity revision is requested, imagine a node
diff --git a/core/modules/media/tests/src/Kernel/MediaTranslationTest.php b/core/modules/media/tests/src/Kernel/MediaTranslationTest.php
index 91596d3de21d..5ba96f3ba446 100644
--- a/core/modules/media/tests/src/Kernel/MediaTranslationTest.php
+++ b/core/modules/media/tests/src/Kernel/MediaTranslationTest.php
@@ -6,7 +6,7 @@
use Drupal\content_translation\ContentTranslationHandler;
/**
- * Tests multilanguage fields logic.
+ * Tests multilingual fields logic.
*
* @group media
*/
diff --git a/core/modules/media_library/js/media_library.ui.js b/core/modules/media_library/js/media_library.ui.js
index 443a426e2193..07023660ad7d 100644
--- a/core/modules/media_library/js/media_library.ui.js
+++ b/core/modules/media_library/js/media_library.ui.js
@@ -58,7 +58,7 @@
$(once('media-library-menu-item', $menu.find('a')))
.on('keypress', (e) => {
// The AJAX link has the button role, so we need to make sure the link
- // is also triggered when pressing the spacebar.
+ // is also triggered when pressing the space bar.
if (e.which === 32) {
e.preventDefault();
e.stopPropagation();
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
index 7eae54e641d7..69d3628e3a6a 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
@@ -212,7 +212,7 @@ public function testWidget() {
$this->assertAnnounceContains('Showing Type Three media.');
$this->switchToMediaType('One');
$this->assertAnnounceContains('Showing Type One media.');
- // Assert the links can be triggered by via the spacebar.
+ // Assert the links can be triggered by via the space bar.
$assert_session->elementExists('named', ['link', 'Type Three'])->keyPress(32);
$this->assertAnnounceContains('Showing Type Three media.');
$assert_session->elementExists('css', '.ui-dialog-titlebar-close')->click();
diff --git a/core/modules/mysql/src/Driver/Database/mysql/Install/Tasks.php b/core/modules/mysql/src/Driver/Database/mysql/Install/Tasks.php
index e27ef369fa24..503a6c7c63eb 100644
--- a/core/modules/mysql/src/Driver/Database/mysql/Install/Tasks.php
+++ b/core/modules/mysql/src/Driver/Database/mysql/Install/Tasks.php
@@ -8,6 +8,8 @@
use Drupal\mysql\Driver\Database\mysql\Connection;
use Drupal\Core\Database\DatabaseNotFoundException;
+// cspell:ignore libmysqlclient
+
/**
* Specifies installation tasks for MySQL and equivalent databases.
*/
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 2029f6608d9c..11e0dc12c4af 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1357,7 +1357,7 @@ function system_requirements($phase) {
];
}
- // See if trusted hostnames have been configured, and warn the user if they
+ // See if trusted host names have been configured, and warn the user if they
// are not set.
if ($phase == 'runtime') {
$trusted_host_patterns = Settings::get('trusted_host_patterns');
diff --git a/core/modules/tour/tests/src/Functional/TourTestBase.php b/core/modules/tour/tests/src/Functional/TourTestBase.php
index 6fabf4c7ec2a..eea6f3a0a69a 100644
--- a/core/modules/tour/tests/src/Functional/TourTestBase.php
+++ b/core/modules/tour/tests/src/Functional/TourTestBase.php
@@ -17,7 +17,7 @@ abstract class TourTestBase extends BrowserTestBase {
* // Basic example.
* $this->assertTourTips();
*
- * // Advanced example. The following would be used for multipage or
+ * // Advanced example. The following would be used for multi-page or
* // targeting a specific subset of tips.
* $tips = array();
* $tips[] = array('data-id' => 'foo');
diff --git a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
index 90366e10bc29..6338363eecd4 100644
--- a/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/query/SqlTest.php
@@ -297,7 +297,7 @@ public function testLoadEntitiesWithNoRelationshipAndNoRevision() {
'id' => 1,
]);
// Note: Let the same entity be returned multiple times, for example to
- // support the translation usecase.
+ // support the translation use case.
$result[] = new ResultRow([
'id' => 2,
]);
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 3b44c182acc2..1acb8cc92fc5 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -22,7 +22,7 @@
<ini name="memory_limit" value="-1"/>
<!-- Example SIMPLETEST_BASE_URL value: http://localhost -->
<env name="SIMPLETEST_BASE_URL" value=""/>
- <!-- Example SIMPLETEST_DB value: mysql://username:password@localhost/databasename#table_prefix -->
+ <!-- Example SIMPLETEST_DB value: mysql://username:password@localhost/database_name#table_prefix -->
<env name="SIMPLETEST_DB" value=""/>
<!-- Example BROWSERTEST_OUTPUT_DIRECTORY value: /path/to/webroot/sites/simpletest/browser_output -->
<env name="BROWSERTEST_OUTPUT_DIRECTORY" value=""/>
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index ea383dd7e19c..56ad3e553f4d 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -271,7 +271,7 @@ function simpletest_script_help() {
Required when running tests without a Drupal installation that
contains default database connection info in settings.php.
Examples:
- mysql://username:password@localhost/databasename#table_prefix
+ mysql://username:password@localhost/database_name#table_prefix
sqlite://localhost/relative/path/db.sqlite
sqlite://localhost//absolute/path/db.sqlite
diff --git a/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php b/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
index 7c952fdb9faa..32d411ac1dfc 100644
--- a/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
+++ b/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
@@ -101,7 +101,7 @@ protected function configure() {
->addOption('json', NULL, InputOption::VALUE_NONE, 'Output test site connection details in JSON.')
->addUsage('--setup-file core/tests/Drupal/TestSite/TestSiteMultilingualInstallTestScript.php --json')
->addUsage('--install-profile demo_umami --langcode fr')
- ->addUsage('--base-url "http://example.com" --db-url "mysql://username:password@localhost/databasename#table_prefix"');
+ ->addUsage('--base-url "http://example.com" --db-url "mysql://username:password@localhost/database_name#table_prefix"');
}
/**
diff --git a/core/tests/Drupal/TestSite/Commands/TestSiteTearDownCommand.php b/core/tests/Drupal/TestSite/Commands/TestSiteTearDownCommand.php
index d3ca19973c11..5820a7a48fcb 100644
--- a/core/tests/Drupal/TestSite/Commands/TestSiteTearDownCommand.php
+++ b/core/tests/Drupal/TestSite/Commands/TestSiteTearDownCommand.php
@@ -32,7 +32,7 @@ protected function configure() {
->addOption('db-url', NULL, InputOption::VALUE_OPTIONAL, 'URL for database. Defaults to the environment variable SIMPLETEST_DB.', getenv('SIMPLETEST_DB'))
->addOption('keep-lock', NULL, InputOption::VALUE_NONE, 'Keeps the database prefix lock. Useful for ensuring test isolation when running concurrent tests.')
->addUsage('test12345678')
- ->addUsage('test12345678 --db-url "mysql://username:password@localhost/databasename#table_prefix"')
+ ->addUsage('test12345678 --db-url "mysql://username:password@localhost/database_name#table_prefix"')
->addUsage('test12345678 --keep-lock');
}
diff --git a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
index 7b97b39c26bd..5411e6d15a5d 100644
--- a/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
@@ -57,7 +57,7 @@ function ($foo) {}, [], ['foo' => NULL], [], [NULL],
];
// Test with a raw value that overrides the provided upcast value, since
- // it is not typehinted.
+ // it is not type hinted.
$scalars = ['foo' => 'baz'];
$objects = ['foo' => new \stdClass()];
$data[] = [
diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/ValidateHostnameTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/ValidateHostnameTest.php
index d48adaaf1039..8e440aefff96 100644
--- a/core/tests/Drupal/Tests/Core/DrupalKernel/ValidateHostnameTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalKernel/ValidateHostnameTest.php
@@ -39,7 +39,7 @@ public function providerTestValidateHostname() {
$data[] = ['security<.drupal.org:80', 'HTTP_HOST with < is invalid'];
$data[] = ['security..drupal.org:80', 'HTTP_HOST with .. is invalid'];
- // Verifies hostnames that are too long, or have too many parts are
+ // Verifies host names that are too long, or have too many parts are
// invalid.
$data[] = [str_repeat('x', 1000) . '.security.drupal.org:80', 'HTTP_HOST with more than 1000 characters is invalid.'];
$data[] = [str_repeat('x.', 100) . 'security.drupal.org:80', 'HTTP_HOST with more than 100 subdomains is invalid.'];
diff --git a/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php b/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
index fb96f146b409..3e90d94c93d3 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ExtensionListTest.php
@@ -137,12 +137,12 @@ public function testGetAllInstalledInfo() {
}
/**
- * @covers ::getPathnames
+ * @covers ::getPathNames
*/
- public function testGetPathnames() {
+ public function testGetPathNames() {
$test_extension_list = $this->setupTestExtensionList();
- $filenames = $test_extension_list->getPathnames();
+ $filenames = $test_extension_list->getPathNames();
$this->assertEquals([
'test_name' => 'example/test_name/test_name.info.yml',
], $filenames);
@@ -189,7 +189,7 @@ public function testReset() {
$this->assertEquals('example/test_name', $path);
$pathname = $test_extension_list->getPathname('test_name');
$this->assertEquals('example/test_name/test_name.info.yml', $pathname);
- $filenames = $test_extension_list->getPathnames();
+ $filenames = $test_extension_list->getPathNames();
$this->assertEquals([
'test_name' => 'example/test_name/test_name.info.yml',
], $filenames);
@@ -201,7 +201,7 @@ public function testReset() {
$this->assertEquals('example/test_name', $path);
$pathname = $test_extension_list->getPathname('test_name');
$this->assertEquals('example/test_name/test_name.info.yml', $pathname);
- $filenames = $test_extension_list->getPathnames();
+ $filenames = $test_extension_list->getPathNames();
$this->assertEquals([
'test_name' => 'example/test_name/test_name.info.yml',
], $filenames);
diff --git a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
index 62e295861d03..3391aeb94247 100644
--- a/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/PathValidatorTest.php
@@ -79,7 +79,7 @@ public function testIsValidWithFrontpage() {
}
/**
- * Tests the isValid() method for <none> (used for jumplinks).
+ * Tests the isValid() method for <none> (used for jump links).
*
* @covers ::isValid
*/
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 98b25a83581d..9c876acbfff5 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -77,7 +77,7 @@
*
* @code
* $databases['default']['default'] = [
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -193,7 +193,7 @@
* @code
* $databases['default']['default'] = [
* 'driver' => 'pgsql',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -215,7 +215,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
@@ -230,7 +230,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- * 'database' => 'databasename',
+ * 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
diff --git a/sites/example.sites.php b/sites/example.sites.php
index 3b32b5aba169..35995136d3fe 100644
--- a/sites/example.sites.php
+++ b/sites/example.sites.php
@@ -7,7 +7,7 @@
* Configuration file for multi-site support and directory aliasing feature.
*
* This file is required for multi-site support and also allows you to define a
- * set of aliases that map hostnames, ports, and pathnames to configuration
+ * set of aliases that map host names, ports, and path names to configuration
* directories in the sites directory. These aliases are loaded prior to
* scanning for directories, and they are exempt from the normal discovery
* rules. See default.settings.php to view how Drupal discovers the
--
GitLab