Skip to content

Commit 9fd9b38

Browse files
committed
Issue #3417566 by quietone, smustgrave, longwave: Correct more words in comments plus pathnames
1 parent c1a6a25 commit 9fd9b38

File tree

39 files changed

+72
-78
lines changed

39 files changed

+72
-78
lines changed

INSTALL.mysql.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ by your host). In the following examples, 'username' is an example MySQL user
77
which has the CREATE and GRANT privileges. Use the appropriate user name for
88
your system.
99

10-
First, you must create a new database for your Drupal site (here, 'databasename'
11-
is the name of the new database):
10+
First, you must create a new database for your Drupal site (here,
11+
'database_name' is the name of the new database):
1212

13-
mysqladmin -u username -p create databasename
13+
mysqladmin -u username -p create database_name
1414

1515
MySQL will prompt for the 'username' database password and then create the
1616
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
2121
prompt, enter the following command:
2222

2323
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
24-
CREATE TEMPORARY TABLES ON databasename.*
24+
CREATE TEMPORARY TABLES ON database_name.*
2525
TO 'username'@'localhost' IDENTIFIED BY 'password';
2626

2727
where:
2828

29-
'databasename' is the name of your database
29+
'database_name' is the name of your database
3030
'username' is the username of your MySQL account
3131
'localhost' is the web server host where Drupal is installed
3232
'password' is the password required for that username

INSTALL.pgsql.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
1919

2020
This step is only necessary if you don't already have a database set up
2121
(e.g., by your host) or want to create a new database for use with Drupal
22-
only. The following command creates a new database named 'databasename',
22+
only. The following command creates a new database named 'database_name',
2323
which is owned by the previously created 'username':
2424

25-
createdb --encoding=UTF8 --owner=username databasename
25+
createdb --encoding=UTF8 --owner=username database_name
2626

2727
If there are no errors, then the command was successful.
2828

assets/scaffold/files/default.settings.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
*
7878
* @code
7979
* $databases['default']['default'] = [
80-
* 'database' => 'databasename',
80+
* 'database' => 'database_name',
8181
* 'username' => 'sql_username',
8282
* 'password' => 'sql_password',
8383
* 'host' => 'localhost',
@@ -193,7 +193,7 @@
193193
* @code
194194
* $databases['default']['default'] = [
195195
* 'driver' => 'pgsql',
196-
* 'database' => 'databasename',
196+
* 'database' => 'database_name',
197197
* 'username' => 'sql_username',
198198
* 'password' => 'sql_password',
199199
* 'host' => 'localhost',
@@ -215,7 +215,7 @@
215215
* 'driver' => 'my_driver',
216216
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
217217
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
218-
* 'database' => 'databasename',
218+
* 'database' => 'database_name',
219219
* 'username' => 'sql_username',
220220
* 'password' => 'sql_password',
221221
* 'host' => 'localhost',
@@ -230,7 +230,7 @@
230230
* 'driver' => 'my_driver',
231231
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
232232
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
233-
* 'database' => 'databasename',
233+
* 'database' => 'database_name',
234234
* 'username' => 'sql_username',
235235
* 'password' => 'sql_password',
236236
* 'host' => 'localhost',

assets/scaffold/files/example.sites.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Configuration file for multi-site support and directory aliasing feature.
88
*
99
* This file is required for multi-site support and also allows you to define a
10-
* set of aliases that map hostnames, ports, and pathnames to configuration
10+
* set of aliases that map host names, ports, and path names to configuration
1111
* directories in the sites directory. These aliases are loaded prior to
1212
* scanning for directories, and they are exempt from the normal discovery
1313
* rules. See default.settings.php to view how Drupal discovers the

lib/Drupal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public static function cache($bin = 'default') {
346346
* an object of a class that implements
347347
* \Drupal\Core\DependencyInjection\ContainerInjectionInterface.
348348
*
349-
* One common usecase is to provide a class which contains the actual code
349+
* One common use case is to provide a class which contains the actual code
350350
* of a hook implementation, without having to create a service.
351351
*
352352
* @param string $class

lib/Drupal/Component/Utility/HtmlSerializerRules.php

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
use Masterminds\HTML5\Serializer\OutputRules;
88

9+
// cspell:ignore drupalhtmlbuilder
10+
911
/**
1012
* Drupal-specific HTML5 serializer rules.
1113
*

lib/Drupal/Core/Access/CsrfTokenGenerator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public function validate($token, $value = '') {
8787
return FALSE;
8888
}
8989
$value = $this->computeToken($seed, $value);
90-
// PHP 8.0 strictly typehints for hash_equals. Maintain BC until we can
91-
// enforce scalar typehints on this method.
90+
// PHP 8.0 strictly type hints for hash_equals. Maintain BC until we can
91+
// enforce scalar type hints on this method.
9292
if (!is_string($token)) {
9393
return FALSE;
9494
}

lib/Drupal/Core/Database/Install/Tasks.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public function getFormOptions(array $database) {
313313
'#title' => t('Host'),
314314
'#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
315315
'#size' => 45,
316-
// Hostnames can be 255 characters long.
316+
// Host names can be 255 characters long.
317317
'#maxlength' => 255,
318318
'#required' => TRUE,
319319
];

lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ abstract class TransactionManagerBase implements TransactionManagerInterface {
3333
* additional savepoints, and release any savepoint in the sequence. When
3434
* this happens, the database will implicitly release all the savepoints
3535
* created after the one released. Given Drupal implementation of the
36-
* Transaction objects, we cannot force descoping of the corresponding
37-
* Transaction savepoint objects from the manager, because they live in the
38-
* scope of the calling code. This stack ensures that when an outlived
39-
* Transaction object gets out of scope, it will not try to release on the
40-
* database a savepoint that no longer exists.
36+
* Transaction objects, we cannot force reducing the scope of the
37+
* corresponding Transaction savepoint objects from the manager, because they
38+
* live in the scope of the calling code. This stack ensures that when an
39+
* outlived Transaction object gets out of scope, it will not try to release
40+
* on the database a savepoint that no longer exists.
4141
*
4242
* Differently, rollbacks are strictly being checked for LIFO order: if a
4343
* rollback is requested against a savepoint that is not the last created,

lib/Drupal/Core/DrupalKernel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
189189
protected $containerNeedsDumping;
190190

191191
/**
192-
* List of discovered services.yml pathnames.
192+
* List of discovered services.yml path names.
193193
*
194194
* This is a nested array whose top-level keys are 'app' and 'site', denoting
195195
* the origin of a service provider. Site-specific providers have to be

lib/Drupal/Core/Entity/EntityForm.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function setOperation($operation) {
6262
* {@inheritdoc}
6363
*/
6464
public function getBaseFormId() {
65-
// Assign ENTITYTYPE_form as base form ID to invoke corresponding
65+
// Assign ENTITY_TYPE_form as base form ID to invoke corresponding
6666
// hook_form_alter(), #validate, #submit, and #theme callbacks, but only if
6767
// it is different from the actual form ID, since callbacks would be invoked
6868
// twice otherwise.

lib/Drupal/Core/Extension/DatabaseDriverList.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ protected function recalculateInfo() {
204204
/**
205205
* {@inheritdoc}
206206
*/
207-
public function getPathnames() {
207+
public function getPathNames() {
208208
throw new \LogicException(__METHOD__ . '() is not implemented');
209209
}
210210

211211
/**
212212
* {@inheritdoc}
213213
*/
214-
protected function recalculatePathnames() {
214+
protected function recalculatePathNames() {
215215
throw new \LogicException(__METHOD__ . '() is not implemented');
216216
}
217217

lib/Drupal/Core/Extension/ExtensionList.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ public function reset() {
170170
$this->pathNames = NULL;
171171

172172
try {
173-
$this->state->delete($this->getPathnamesCacheId());
173+
$this->state->delete($this->getPathNamesCacheId());
174174
}
175175
catch (DatabaseExceptionWrapper $e) {
176176
// Ignore exceptions caused by a non existing {key_value} table in the
177177
// early installer.
178178
}
179179

180-
$this->cache->delete($this->getPathnamesCacheId());
180+
$this->cache->delete($this->getPathNamesCacheId());
181181
// @todo In the long run it would be great to add the reset, but the early
182182
// installer fails due to that. https://www.drupal.org/node/2719315 could
183183
// help to resolve with that.
@@ -210,7 +210,7 @@ protected function getInfoCacheId() {
210210
* @return string
211211
* The filename cache ID.
212212
*/
213-
protected function getPathnamesCacheId() {
213+
protected function getPathNamesCacheId() {
214214
return "system.{$this->type}.files";
215215
}
216216

@@ -413,15 +413,15 @@ protected function recalculateInfo() {
413413
*
414414
* @return string[]
415415
*/
416-
public function getPathnames() {
416+
public function getPathNames() {
417417
if ($this->pathNames === NULL) {
418-
$cache_id = $this->getPathnamesCacheId();
418+
$cache_id = $this->getPathNamesCacheId();
419419
if ($cache = $this->cache->get($cache_id)) {
420420
$path_names = $cache->data;
421421
}
422422
// We use $file_names below.
423423
elseif (!$path_names = $this->state->get($cache_id)) {
424-
$path_names = $this->recalculatePathnames();
424+
$path_names = $this->recalculatePathNames();
425425
// Store filenames to allow static::getPathname() to retrieve them
426426
// without having to rebuild or scan the filesystem.
427427
$this->state->set($cache_id, $path_names);
@@ -438,7 +438,7 @@ public function getPathnames() {
438438
* @return string[]
439439
* An array of .info.yml file locations keyed by the extension machine name.
440440
*/
441-
protected function recalculatePathnames() {
441+
protected function recalculatePathNames() {
442442
$extensions = $this->getList();
443443
ksort($extensions);
444444

@@ -518,7 +518,7 @@ public function getPathname($extension_name) {
518518
elseif (isset($this->pathNames[$extension_name])) {
519519
return $this->pathNames[$extension_name];
520520
}
521-
elseif (($path_names = $this->getPathnames()) && isset($path_names[$extension_name])) {
521+
elseif (($path_names = $this->getPathNames()) && isset($path_names[$extension_name])) {
522522
return $path_names[$extension_name];
523523
}
524524
throw new UnknownExtensionException("The {$this->type} $extension_name does not exist.");

lib/Drupal/Core/Installer/ExtensionListTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getPathname($extension_name) {
4343
elseif (isset(static::$staticAddedPathNames[$extension_name])) {
4444
return static::$staticAddedPathNames[$extension_name];
4545
}
46-
elseif (($path_names = $this->getPathnames()) && isset($path_names[$extension_name])) {
46+
elseif (($path_names = $this->getPathNames()) && isset($path_names[$extension_name])) {
4747
// Ensure we don't have to do path scanning more than really needed.
4848
foreach ($path_names as $extension => $path_name) {
4949
static::$staticAddedPathNames[$extension] = $path_name;

lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Drupal\Core\Render;
44

5+
// cspell:ignore turbolinks
6+
57
use Drupal\Core\Asset\AssetCollectionRendererInterface;
68
use Drupal\Core\Asset\AssetResolverInterface;
79
use Drupal\Core\Asset\AttachedAssets;

lib/Drupal/Core/Routing/RouteProvider.php

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use Symfony\Component\Routing\RouteCollection;
1717
use Drupal\Core\Database\Connection;
1818

19+
// cspell:ignore filesort
20+
1921
/**
2022
* A Route Provider front-end for all Drupal-stored routes.
2123
*/

lib/Drupal/Core/Test/TestDiscovery.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function getTestClasses($extension = NULL, array $types = []) {
163163
// Prevent expensive class loader lookups for each reflected test class by
164164
// registering the complete classmap of test classes to the class loader.
165165
// This also ensures that test classes are loaded from the discovered
166-
// pathnames; a namespace/classname mismatch will throw an exception.
166+
// path names; a namespace/classname mismatch will throw an exception.
167167
$this->classLoader->addClassMap($classmap);
168168

169169
foreach ($classmap as $classname => $pathname) {
@@ -213,7 +213,7 @@ public function getTestClasses($extension = NULL, array $types = []) {
213213
*
214214
* @return array
215215
* A classmap containing all discovered class files; i.e., a map of
216-
* fully-qualified classnames to pathnames.
216+
* fully-qualified classnames to path names.
217217
*/
218218
public function findAllClassFiles($extension = NULL) {
219219
$classmap = [];
@@ -247,7 +247,7 @@ public function findAllClassFiles($extension = NULL) {
247247
*
248248
* @return array
249249
* An associative array whose keys are fully-qualified class names and whose
250-
* values are corresponding filesystem pathnames.
250+
* values are corresponding filesystem path names.
251251
*
252252
* @throws \InvalidArgumentException
253253
* If $namespace_prefix does not end in a namespace separator (backslash).

lib/Drupal/Core/Update/UpdateRegistry.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
1010
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1111

12+
// cspell:ignore updatetype
13+
1214
/**
1315
* Provides all and missing update implementations.
1416
*

misc/ajax.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@
724724
* The Ajax object will, if instructed, bind to a key press response. This
725725
* will test to see if the key press is valid to trigger this event and
726726
* if it is, trigger it for us and prevent other keypresses from triggering.
727-
* In this case we're handling RETURN and SPACEBAR keypresses (event codes 13
727+
* In this case we're handling RETURN and SPACE BAR keypresses (event codes 13
728728
* and 32. RETURN is often used to submit a form when in a textfield, and
729729
* SPACE is often used to activate an element without submitting.
730730
*
@@ -739,7 +739,7 @@
739739

740740
// Detect enter key and space bar and allow the standard response for them,
741741
// except for form elements of type 'text', 'tel', 'number' and 'textarea',
742-
// where the spacebar activation causes inappropriate activation if
742+
// where the space bar activation causes inappropriate activation if
743743
// #ajax['keypress'] is TRUE. On a text-type widget a space should always
744744
// be a space.
745745
if (

0 commit comments

Comments
 (0)