From 2624df1b1c316517308451897068473bfea4d917 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Fri, 2 Feb 2024 11:44:34 +0000
Subject: [PATCH] Issue #3412959 by quietone, smustgrave, longwave: Fix 12 'un'
words
---
core/lib/Drupal/Core/Form/FormBuilderInterface.php | 4 ++--
core/lib/Drupal/Core/Form/FormState.php | 2 +-
core/lib/Drupal/Core/Form/FormStateInterface.php | 4 ++--
.../Drupal/Core/Form/FormValidatorInterface.php | 2 +-
core/lib/Drupal/Core/GeneratedLink.php | 3 ++-
core/lib/Drupal/Core/GeneratedUrl.php | 2 +-
.../Core/StreamWrapper/StreamWrapperManager.php | 2 +-
core/misc/cspell/dictionary.txt | 12 ------------
core/modules/ban/src/BanIpManagerInterface.php | 2 +-
.../src/Plugin/CKEditor5Plugin/CodeBlock.php | 12 ++++++------
.../ckeditor5/src/Plugin/CKEditor5Plugin/Style.php | 14 +++++++-------
.../tests/src/Functional/ResourceTestBase.php | 12 ++++++------
.../LayoutBuilderDisableInteractionsTest.php | 10 +++++-----
.../Field/FieldWidget/MediaLibraryWidget.php | 6 +++---
.../migrate/destination/EntityContentBase.php | 2 +-
.../tests/src/Kernel/NodeAccessRecordsTest.php | 8 ++++----
.../EntityResource/EntityResourceTestBase.php | 12 ++++++------
.../shortcut/src/ShortcutSetStorageInterface.php | 2 +-
.../tests/src/Functional/ShortcutSetsTest.php | 2 +-
.../themes/umami/css/classy/components/details.css | 2 +-
.../FunctionalJavascriptTests/Ajax/AjaxTest.php | 6 +++---
.../KernelTests/Core/Entity/EntityDeriverTest.php | 8 ++++----
core/tests/Drupal/TestTools/Random.php | 2 +-
.../Tests/Core/DrupalKernel/DrupalKernelTest.php | 2 +-
.../Drupal/Tests/Core/Render/RendererTestBase.php | 2 +-
core/tests/Drupal/Tests/RandomGeneratorTrait.php | 2 +-
.../starterkit_theme/css/components/details.css | 2 +-
27 files changed, 64 insertions(+), 75 deletions(-)
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index 8ac7339b09fc..b5e51a5826da 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -307,8 +307,8 @@ public function prepareForm($form_id, &$form, FormStateInterface &$form_state);
* run before user input for its child elements is processed, and because of
* the Form API security of user input processing with respect to #access and
* #disabled described above, this generally means that #process functions
- * should not use an element's (unvalidated) #value to affect the #disabled or
- * #access of child elements. Use-cases where a developer may be tempted to
+ * should not use an element's (non validated) #value to affect the #disabled
+ * or #access of child elements. Use-cases where a developer may be tempted to
* implement such conditional logic usually fall into one of two categories:
* - Where user input from the current submission must affect the structure of
* a form, including properties like #access and #disabled that affect how
diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index 7e6d974cb73f..116fe62fd0c6 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -258,7 +258,7 @@ class FormState implements FormStateInterface {
/**
* The array of values as they were submitted by the user.
*
- * These are raw and unvalidated, so should not be used without a thorough
+ * These are raw and non validated, so should not be used without a thorough
* understanding of security implications. In almost all cases, code should
* use the data in the 'values' array exclusively. The most common use of this
* key is for multi-step forms that need to clear some of the user input when
diff --git a/core/lib/Drupal/Core/Form/FormStateInterface.php b/core/lib/Drupal/Core/Form/FormStateInterface.php
index f1b459729da2..65720d44edf6 100644
--- a/core/lib/Drupal/Core/Form/FormStateInterface.php
+++ b/core/lib/Drupal/Core/Form/FormStateInterface.php
@@ -301,7 +301,7 @@ public function addBuildInfo($property, $value);
/**
* Returns the form values as they were submitted by the user.
*
- * These are raw and unvalidated, so should not be used without a thorough
+ * These are raw and non validated, so should not be used without a thorough
* understanding of security implications. In almost all cases, code should
* use self::getValues() and self::getValue() exclusively.
*
@@ -314,7 +314,7 @@ public function &getUserInput();
* Sets the form values as though they were submitted by a user.
*
* @param array $user_input
- * An associative array of raw and unvalidated values.
+ * An associative array of raw and non validated values.
*
* @return $this
*/
diff --git a/core/lib/Drupal/Core/Form/FormValidatorInterface.php b/core/lib/Drupal/Core/Form/FormValidatorInterface.php
index b7e24231e72d..2016445b362d 100644
--- a/core/lib/Drupal/Core/Form/FormValidatorInterface.php
+++ b/core/lib/Drupal/Core/Form/FormValidatorInterface.php
@@ -35,7 +35,7 @@ public function executeValidateHandlers(&$form, FormStateInterface &$form_state)
* in case of a validation error. If a validation handler alters the form
* structure, it is responsible for validating the values of changed form
* elements in $form_state->getValues() to prevent form submit handlers from
- * receiving unvalidated values.
+ * receiving non validated values.
* @param $form_state
* The current state of the form. The current user-submitted data is stored
* in $form_state->getValues(), though form validation functions are passed
diff --git a/core/lib/Drupal/Core/GeneratedLink.php b/core/lib/Drupal/Core/GeneratedLink.php
index 3bb89b8ea80b..0c484836f11f 100644
--- a/core/lib/Drupal/Core/GeneratedLink.php
+++ b/core/lib/Drupal/Core/GeneratedLink.php
@@ -9,7 +9,8 @@
* Used to return generated links, along with associated cacheability metadata.
*
* Note: not to be confused with \Drupal\Core\Link, which is for passing around
- * ungenerated links (typically link text + route name + route parameters).
+ * links that are not generated (typically link text + route name + route
+ * parameters).
*/
class GeneratedLink extends BubbleableMetadata implements MarkupInterface, \Countable {
diff --git a/core/lib/Drupal/Core/GeneratedUrl.php b/core/lib/Drupal/Core/GeneratedUrl.php
index ccb6e9a76899..47d0f350a4a8 100644
--- a/core/lib/Drupal/Core/GeneratedUrl.php
+++ b/core/lib/Drupal/Core/GeneratedUrl.php
@@ -8,7 +8,7 @@
* Used to return generated URLs, along with associated bubbleable metadata.
*
* Note: not to be confused with \Drupal\Core\Url, which is for passing around
- * ungenerated URLs (typically route name + route parameters).
+ * URLs that are not generated (typically route name + route parameters).
*/
class GeneratedUrl extends BubbleableMetadata {
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index 82146af3d372..1c08700dc691 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -176,7 +176,7 @@ public function register() {
}
/**
- * Unregisters the tagged stream wrappers.
+ * Deregisters the tagged stream wrappers.
*
* Internal use only.
*/
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 8785df0da9e1..c10740041070 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -884,18 +884,11 @@ typehints
tzid
uids
ulwa
-unassigning
-unassigns
unban
-unbans
-unbundleable
uncacheable
uncategorized
-unclickable
-uncollapsible
undoable
unfieldable
-ungenerated
ungroup
ungroupable
unindexed
@@ -904,13 +897,10 @@ uninstallations
unmanaged
unminified
unmoderated
-unparseable
unpromote
-unpromoted
unpublish
unpublishes
unpublishing
-unregisters
unrevisionable
unrouted
unsanitized
@@ -922,8 +912,6 @@ unsets
unsetting
unsticky
untabbable
-unvalidated
-unwrapper
upcasted
upcasting
updateprogress
diff --git a/core/modules/ban/src/BanIpManagerInterface.php b/core/modules/ban/src/BanIpManagerInterface.php
index f298723a8d86..b9c6bf127780 100644
--- a/core/modules/ban/src/BanIpManagerInterface.php
+++ b/core/modules/ban/src/BanIpManagerInterface.php
@@ -35,7 +35,7 @@ public function findAll();
public function banIp($ip);
/**
- * Unbans an IP address.
+ * Removes the ban of an IP address.
*
* @param string $id
* The IP address to unban.
diff --git a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/CodeBlock.php b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/CodeBlock.php
index 364ca1733dac..b3d3089bb2c7 100644
--- a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/CodeBlock.php
+++ b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/CodeBlock.php
@@ -45,11 +45,11 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
*/
public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
$form_value = $form_state->getValue('languages');
- [$styles, $unparseable_lines] = self::parseLanguagesFromValue($form_value);
- if (!empty($unparseable_lines)) {
- $line_numbers = array_keys($unparseable_lines);
+ [$styles, $not_parseable_lines] = self::parseLanguagesFromValue($form_value);
+ if (!empty($not_parseable_lines)) {
+ $line_numbers = array_keys($not_parseable_lines);
$form_state->setError($form['languages'], $this->formatPlural(
- count($unparseable_lines),
+ count($not_parseable_lines),
'Line @line-number does not contain a valid value. Enter a valid language key followed by a pipe symbol and a label.',
'Lines @line-numbers do not contain a valid value. Enter a valid language key followed by a pipe symbol and a label.',
[
@@ -73,7 +73,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
* - language: the key for the language
*/
protected static function parseLanguagesFromValue(string $form_value): array {
- $unparseable_lines = [];
+ $not_parseable_lines = [];
$lines = explode("\n", $form_value);
$languages = [];
@@ -90,7 +90,7 @@ protected static function parseLanguagesFromValue(string $form_value): array {
'language' => $language,
];
}
- return [$languages, $unparseable_lines];
+ return [$languages, $not_parseable_lines];
}
/**
diff --git a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Style.php b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Style.php
index 89e2d23c9416..e0833c965d11 100644
--- a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Style.php
+++ b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Style.php
@@ -68,11 +68,11 @@ public static function getTagAndClasses(HTMLRestrictions $style_element): array
public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
// Match the config schema structure at ckeditor5.plugin.ckeditor5_style.
$form_value = $form_state->getValue('styles');
- [$styles, $unparseable_lines] = self::parseStylesFormValue($form_value);
- if (!empty($unparseable_lines)) {
- $line_numbers = array_keys($unparseable_lines);
+ [$styles, $invalid_lines] = self::parseStylesFormValue($form_value);
+ if (!empty($invalid_lines)) {
+ $line_numbers = array_keys($invalid_lines);
$form_state->setError($form['styles'], $this->formatPlural(
- count($unparseable_lines),
+ count($invalid_lines),
'Line @line-number does not contain a valid value. Enter a valid CSS selector containing one or more classes, followed by a pipe symbol and a label.',
'Lines @line-numbers do not contain a valid value. Enter a valid CSS selector containing one or more classes, followed by a pipe symbol and a label.',
[
@@ -104,7 +104,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
* @see \Drupal\ckeditor5\Plugin\CKEditor4To5Upgrade\Core::mapCKEditor4SettingsToCKEditor5Configuration()
*/
public static function parseStylesFormValue(string $form_value): array {
- $unparseable_lines = [];
+ $invalid_lines = [];
$lines = explode("\n", $form_value);
$styles = [];
@@ -120,7 +120,7 @@ public static function parseStylesFormValue(string $form_value): array {
$selector_matches = [];
// @see https://www.w3.org/TR/CSS2/syndata.html#:~:text=In%20CSS%2C%20identifiers%20(including%20element,hyphen%20followed%20by%20a%20digit
if (!preg_match('/^([a-z][0-9a-zA-Z\-]*)((\.[a-zA-Z0-9\x{00A0}-\x{FFFF}\-_]+)+)$/u', $selector, $selector_matches)) {
- $unparseable_lines[$index + 1] = $line;
+ $invalid_lines[$index + 1] = $line;
continue;
}
@@ -134,7 +134,7 @@ public static function parseStylesFormValue(string $form_value): array {
'element' => $normalized->toCKEditor5ElementsArray()[0],
];
}
- return [$styles, $unparseable_lines];
+ return [$styles, $invalid_lines];
}
/**
diff --git a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
index 8640f010e2a5..8338efaa86c6 100644
--- a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
@@ -1965,7 +1965,7 @@ public function testPostIndividual() {
}
// Try with all of the following request bodies.
- $unparseable_request_body = '!{>}<';
+ $not_parseable_request_body = '!{>}<';
$parseable_valid_request_body = Json::encode($this->getPostDocument());
$parseable_invalid_request_body_missing_type = Json::encode($this->removeResourceTypeFromDocument($this->getPostDocument()));
if ($this->entity->getEntityType()->hasKey('label')) {
@@ -2014,9 +2014,9 @@ public function testPostIndividual() {
$response = $this->request('POST', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Empty request body.', $url, $response, FALSE);
- $request_options[RequestOptions::BODY] = $unparseable_request_body;
+ $request_options[RequestOptions::BODY] = $not_parseable_request_body;
- // DX: 400 when unparseable request body.
+ // DX: 400 when un-parseable request body.
$response = $this->request('POST', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Syntax error', $url, $response, FALSE);
@@ -2185,7 +2185,7 @@ public function testPatchIndividual() {
$this->anotherEntity = $this->createAnotherEntity('dupe');
// Try with all of the following request bodies.
- $unparseable_request_body = '!{>}<';
+ $not_parseable_request_body = '!{>}<';
$parseable_valid_request_body = Json::encode($this->getPatchDocument());
if ($this->entity->getEntityType()->hasKey('label')) {
$parseable_invalid_request_body = Json::encode($this->makeNormalizationInvalid($this->getPatchDocument(), 'label'));
@@ -2237,9 +2237,9 @@ public function testPatchIndividual() {
$response = $this->request('PATCH', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Empty request body.', $url, $response, FALSE);
- $request_options[RequestOptions::BODY] = $unparseable_request_body;
+ $request_options[RequestOptions::BODY] = $not_parseable_request_body;
- // DX: 400 when unparseable request body.
+ // DX: 400 when un-parseable request body.
$response = $this->request('PATCH', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Syntax error', $url, $response, FALSE);
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
index 327930336b75..82447cc665d8 100644
--- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
+++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
@@ -176,14 +176,14 @@ protected function addBlock($block_link_text, $rendered_locator) {
}
/**
- * Checks if element is unclickable.
+ * Checks if element is not clickable.
*
* @param \Behat\Mink\Element\NodeElement $element
* Element being checked for.
*
* @internal
*/
- protected function assertElementUnclickable(NodeElement $element): void {
+ protected function assertElementNotClickable(NodeElement $element): void {
try {
$element->click();
$tag_name = $element->getTagName();
@@ -205,11 +205,11 @@ protected function assertLinksFormIframeNotInteractive(): void {
$this->assertNotEmpty($assert_session->waitForElement('css', '.block-search'));
$searchButton = $assert_session->buttonExists('Search');
- $this->assertElementUnclickable($searchButton);
+ $this->assertElementNotClickable($searchButton);
$assert_session->linkExists('Take me away');
- $this->assertElementUnclickable($page->findLink('Take me away'));
+ $this->assertElementNotClickable($page->findLink('Take me away'));
$iframe = $assert_session->elementExists('css', '#iframe-that-should-be-disabled');
- $this->assertElementUnclickable($iframe);
+ $this->assertElementNotClickable($iframe);
}
/**
diff --git a/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php b/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
index 6ba3510eb75b..88c652890bea 100644
--- a/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
+++ b/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
@@ -925,8 +925,8 @@ public static function addItems(array $form, FormStateInterface $form_state) {
*/
protected static function getNewMediaItems(array $element, FormStateInterface $form_state) {
// Get the new media IDs passed to our hidden button. We need to use the
- // actual user input, since when #limit_validation_errors is used, the
- // unvalidated user input is not added to the form state.
+ // actual user input, since when #limit_validation_errors is used, any
+ // non validated user input is not added to the form state.
// @see FormValidator::handleErrorsWithLimitedValidation()
$values = $form_state->getUserInput();
$path = $element['#parents'];
@@ -961,7 +961,7 @@ protected static function getFieldState(array $element, FormStateInterface $form
// Default to using the current selection if the form is new.
$path = $element['#parents'];
// We need to use the actual user input, since when #limit_validation_errors
- // is used, the unvalidated user input is not added to the form state.
+ // is used, the non validated user input is not added to the form state.
// @see FormValidator::handleErrorsWithLimitedValidation()
$values = NestedArray::getValue($form_state->getUserInput(), $path);
$selection = $values['selection'] ?? [];
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index 64223b20ea69..7aa1db949311 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -184,7 +184,7 @@ public function import(Row $row, array $old_destination_id_values = []) {
*/
public function isEntityValidationRequired(FieldableEntityInterface $entity) {
// Prioritize the entity method over migration config because it won't be
- // possible to save that entity unvalidated.
+ // possible to save that entity non validated.
/* @see \Drupal\Core\Entity\ContentEntityBase::preSave() */
return $entity->isValidationRequired() || !empty($this->configuration['validate']);
}
diff --git a/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php b/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
index 6c7d2004755d..f2568d825861 100644
--- a/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
+++ b/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
@@ -38,9 +38,9 @@ public function testNodeAccessRecords() {
$this->assertEquals('test_article_realm', $records[0]->realm, 'Grant with article_realm acquired for node without alteration.');
$this->assertEquals(1, $records[0]->gid, 'Grant with gid = 1 acquired for node without alteration.');
- // Create an unpromoted "Basic page" node.
+ // Create an un-promoted "Basic page" node.
$node2 = $this->drupalCreateNode(['type' => 'page', 'promote' => 0]);
- $this->assertNotEmpty(Node::load($node2->id()), 'Unpromoted basic page node created.');
+ $this->assertNotEmpty(Node::load($node2->id()), 'Un-promoted basic page node created.');
// Check to see if grants added by node_test_node_access_records made it in.
$records = $connection->select('node_access', 'na')
@@ -52,9 +52,9 @@ public function testNodeAccessRecords() {
$this->assertEquals('test_page_realm', $records[0]->realm, 'Grant with page_realm acquired for node without alteration.');
$this->assertEquals(1, $records[0]->gid, 'Grant with gid = 1 acquired for node without alteration.');
- // Create an unpromoted, unpublished "Basic page" node.
+ // Create an un-promoted, unpublished "Basic page" node.
$node3 = $this->drupalCreateNode(['type' => 'page', 'promote' => 0, 'status' => 0]);
- $this->assertNotEmpty(Node::load($node3->id()), 'Unpromoted, unpublished basic page node created.');
+ $this->assertNotEmpty(Node::load($node3->id()), 'Un-promoted, unpublished basic page node created.');
// Check to see if grants added by node_test_node_access_records made it in.
$records = $connection->select('node_access', 'na')
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 23f2f5ba9188..dc14cc47ccd9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -692,7 +692,7 @@ public function testPost() {
$has_canonical_url = $this->entity->hasLinkTemplate('canonical');
// Try with all of the following request bodies.
- $unparseable_request_body = '!{>}<';
+ $not_parseable_request_body = '!{>}<';
$parseable_valid_request_body = $this->serializer->encode($this->getNormalizedPostEntity(), static::$format);
$parseable_invalid_request_body = $this->serializer->encode($this->makeNormalizationInvalid($this->getNormalizedPostEntity(), 'label'), static::$format);
$parseable_invalid_request_body_2 = $this->serializer->encode($this->getNormalizedPostEntity() + ['uuid' => [$this->randomMachineName(129)]], static::$format);
@@ -756,9 +756,9 @@ public function testPost() {
$response = $this->request('POST', $url, $request_options);
$this->assertResourceErrorResponse(400, 'No entity content received.', $response);
- $request_options[RequestOptions::BODY] = $unparseable_request_body;
+ $request_options[RequestOptions::BODY] = $not_parseable_request_body;
- // DX: 400 when unparseable request body.
+ // DX: 400 when un-parseable request body.
$response = $this->request('POST', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Syntax error', $response);
@@ -869,7 +869,7 @@ public function testPatch() {
$has_canonical_url = $this->entity->hasLinkTemplate('canonical');
// Try with all of the following request bodies.
- $unparseable_request_body = '!{>}<';
+ $not_parseable_request_body = '!{>}<';
$parseable_valid_request_body = $this->serializer->encode($this->getNormalizedPatchEntity(), static::$format);
$parseable_invalid_request_body = $this->serializer->encode($this->makeNormalizationInvalid($this->getNormalizedPatchEntity(), 'label'), static::$format);
$parseable_invalid_request_body_2 = $this->serializer->encode($this->getNormalizedPatchEntity() + ['field_rest_test' => [['value' => $this->randomString()]]], static::$format);
@@ -948,9 +948,9 @@ public function testPatch() {
$response = $this->request('PATCH', $url, $request_options);
$this->assertResourceErrorResponse(400, 'No entity content received.', $response);
- $request_options[RequestOptions::BODY] = $unparseable_request_body;
+ $request_options[RequestOptions::BODY] = $not_parseable_request_body;
- // DX: 400 when unparseable request body.
+ // DX: 400 when un-parseable request body.
$response = $this->request('PATCH', $url, $request_options);
$this->assertResourceErrorResponse(400, 'Syntax error', $response);
diff --git a/core/modules/shortcut/src/ShortcutSetStorageInterface.php b/core/modules/shortcut/src/ShortcutSetStorageInterface.php
index 47036a670ed9..895b25f78f6a 100644
--- a/core/modules/shortcut/src/ShortcutSetStorageInterface.php
+++ b/core/modules/shortcut/src/ShortcutSetStorageInterface.php
@@ -21,7 +21,7 @@ interface ShortcutSetStorageInterface extends ConfigEntityStorageInterface {
public function assignUser(ShortcutSetInterface $shortcut_set, $account);
/**
- * Unassigns a user from any shortcut set they may have been assigned to.
+ * Un-assigns a user from any shortcut set they may have been assigned to.
*
* The user will go back to using whatever default set applies.
*
diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
index 0367d8960498..2ceefe417e28 100644
--- a/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
@@ -172,7 +172,7 @@ public function testShortcutSetRename() {
}
/**
- * Tests unassigning a shortcut set.
+ * Tests un-assigning a shortcut set.
*/
public function testShortcutSetUnassign() {
$new_set = $this->generateShortcutSet($this->randomMachineName());
diff --git a/core/profiles/demo_umami/themes/umami/css/classy/components/details.css b/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
index a546363a295c..04609fd48f5e 100644
--- a/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
+++ b/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
@@ -14,7 +14,7 @@ details {
details > .details-wrapper {
padding: 0.5em 1.5em;
}
-/* @todo Regression: The summary of uncollapsible details are no longer
+/* @todo Regression: The summary of noncollapsible details are no longer
vertically aligned with the .details-wrapper in browsers without native
details support. */
summary {
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
index a8908a4925e6..3ab47a666e59 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
@@ -111,7 +111,7 @@ public function testInsertAjaxResponse() {
'svg' => '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect x="0" y="0" height="10" width="10" fill="green"></rect></svg>',
'empty' => '',
];
- $render_multiple_root_unwrapper = [
+ $render_multiple_root_unwrap = [
'mixed' => ' foo <!-- COMMENT --> foo bar<div class="a class"><p>some string</p></div> additional not wrapped strings, <!-- ANOTHER COMMENT --> <p>final string</p>',
'top-level-only' => '<div>element #1</div><div>element #2</div>',
'top-level-only-pre-whitespace' => ' <div>element #1</div><div>element #2</div> ',
@@ -121,14 +121,14 @@ public function testInsertAjaxResponse() {
// This is temporary behavior for BC reason.
$render_multiple_root_wrapper = [];
- foreach ($render_multiple_root_unwrapper as $key => $render) {
+ foreach ($render_multiple_root_unwrap as $key => $render) {
$render_multiple_root_wrapper["$key--effect"] = '<div>' . $render . '</div>';
}
$expected_renders = array_merge(
$render_single_root,
$render_multiple_root_wrapper,
- $render_multiple_root_unwrapper
+ $render_multiple_root_unwrap
);
// Checking default process of wrapping Ajax content.
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
index db29e84a8e57..9ae3f6bf32d4 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
@@ -70,8 +70,8 @@ public function testDerivatives($data_type, $expect_exception) {
*/
public function derivativesProvider() {
return [
- 'unbundleable entity type with no bundle type' => ['entity:user', FALSE],
- 'unbundleable entity type with bundle type' => ['entity:user:user', TRUE],
+ 'un-bundleable entity type with no bundle type' => ['entity:user', FALSE],
+ 'un-bundleable entity type with bundle type' => ['entity:user:user', TRUE],
'bundleable entity type with no bundle type' => ['entity:node', FALSE],
'bundleable entity type with bundle type' => [
'entity:node:article',
@@ -81,11 +81,11 @@ public function derivativesProvider() {
'entity:comment:comment',
FALSE,
],
- 'unbundleable entity type with entity_test_entity_bundle_info()-generated bundle type' => [
+ 'un-bundleable entity type with entity_test_entity_bundle_info()-generated bundle type' => [
'entity:entity_test_no_bundle:foo',
FALSE,
],
- 'unbundleable entity type with entity_test_entity_bundle_info()-generated bundle type with matching name' => [
+ 'un-bundleable entity type with entity_test_entity_bundle_info()-generated bundle type with matching name' => [
'entity:entity_test_no_bundle:entity_test_no_bundle',
FALSE,
],
diff --git a/core/tests/Drupal/TestTools/Random.php b/core/tests/Drupal/TestTools/Random.php
index e68bc09bb496..111340488a83 100644
--- a/core/tests/Drupal/TestTools/Random.php
+++ b/core/tests/Drupal/TestTools/Random.php
@@ -91,7 +91,7 @@ public static function stringValidate(string $string): bool {
/**
* Generates a unique random string containing letters and numbers.
*
- * Do not use this method when testing unvalidated user input. Instead, use
+ * Do not use this method when testing non validated user input. Instead, use
* \Drupal\Tests\RandomGeneratorTrait::randomString().
*
* @param int $length
diff --git a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index a6b05c73c461..95630123c348 100644
--- a/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -170,7 +170,7 @@ public function register($prepend = FALSE) {
}
/**
- * Unregisters this instance as an autoloader.
+ * Deregisters this instance as an autoloader.
*/
public function unregister() {
spl_autoload_unregister([$this, 'loadClass']);
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index b5be54f89e32..abc05d1cba4c 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -199,7 +199,7 @@ protected function setUp(): void {
* paths, etc. for JavaScript replacement of content or assets. In this test,
* the #lazy_builder callback PlaceholdersTest::callback() renders the context
* inside test HTML, so using any random string would sometimes cause random
- * test failures because the test output would be unparseable. Instead, we
+ * test failures because the test output would not be parseable. Instead, we
* provide random tokens for replacement.
*
* @see PlaceholdersTest::callback()
diff --git a/core/tests/Drupal/Tests/RandomGeneratorTrait.php b/core/tests/Drupal/Tests/RandomGeneratorTrait.php
index 380b38d73849..5a5d26893453 100644
--- a/core/tests/Drupal/Tests/RandomGeneratorTrait.php
+++ b/core/tests/Drupal/Tests/RandomGeneratorTrait.php
@@ -58,7 +58,7 @@ public function randomStringValidate($string) {
/**
* Generates a unique random string containing letters and numbers.
*
- * Do not use this method when testing unvalidated user input. Instead, use
+ * Do not use this method when testing non validated user input. Instead, use
* \Drupal\Tests\RandomGeneratorTrait::randomString().
*
* @param int $length
diff --git a/core/themes/starterkit_theme/css/components/details.css b/core/themes/starterkit_theme/css/components/details.css
index a546363a295c..04609fd48f5e 100644
--- a/core/themes/starterkit_theme/css/components/details.css
+++ b/core/themes/starterkit_theme/css/components/details.css
@@ -14,7 +14,7 @@ details {
details > .details-wrapper {
padding: 0.5em 1.5em;
}
-/* @todo Regression: The summary of uncollapsible details are no longer
+/* @todo Regression: The summary of noncollapsible details are no longer
vertically aligned with the .details-wrapper in browsers without native
details support. */
summary {
--
GitLab