Skip to content

Commit

Permalink
Issue #3417566 by quietone, smustgrave, longwave: Correct more words …
Browse files Browse the repository at this point in the history
…in comments plus pathnames
  • Loading branch information
longwave committed Feb 8, 2024
1 parent c1a6a25 commit 9fd9b38
Show file tree
Hide file tree
Showing 39 changed files with 72 additions and 78 deletions.
10 changes: 5 additions & 5 deletions INSTALL.mysql.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.pgsql.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions assets/scaffold/files/default.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
*
* @code
* $databases['default']['default'] = [
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand Down Expand Up @@ -193,7 +193,7 @@
* @code
* $databases['default']['default'] = [
* 'driver' => 'pgsql',
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion assets/scaffold/files/example.sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions lib/Drupal/Component/Utility/HtmlSerializerRules.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

use Masterminds\HTML5\Serializer\OutputRules;

// cspell:ignore drupalhtmlbuilder

/**
* Drupal-specific HTML5 serializer rules.
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Drupal/Core/Access/CsrfTokenGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal/Core/Database/Install/Tasks.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
Expand Down
10 changes: 5 additions & 5 deletions lib/Drupal/Core/Database/Transaction/TransactionManagerBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal/Core/DrupalKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal/Core/Entity/EntityForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Drupal/Core/Extension/DatabaseDriverList.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
16 changes: 8 additions & 8 deletions lib/Drupal/Core/Extension/ExtensionList.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -210,7 +210,7 @@ protected function getInfoCacheId() {
* @return string
* The filename cache ID.
*/
protected function getPathnamesCacheId() {
protected function getPathNamesCacheId() {
return "system.{$this->type}.files";
}

Expand Down Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -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.");
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal/Core/Installer/ExtensionListTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions lib/Drupal/Core/Routing/RouteProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 3 additions & 3 deletions lib/Drupal/Core/Test/TestDiscovery.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 = [];
Expand Down Expand Up @@ -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).
Expand Down
2 changes: 2 additions & 0 deletions lib/Drupal/Core/Update/UpdateRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;

// cspell:ignore updatetype

/**
* Provides all and missing update implementations.
*
Expand Down
4 changes: 2 additions & 2 deletions misc/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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 (
Expand Down
Loading

0 comments on commit 9fd9b38

Please sign in to comment.