diff -u b/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
--- b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -189,7 +189,7 @@
$this->assertTrue($same_id->isNew());
try {
$same_id->save();
- $this->fail('Not possible to overwrite an entity.');
+ $this->fail('Not possible to overwrite an entity.');
}
catch (EntityStorageException $e) {
// Expected exception; just continue testing.
diff -u b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
--- b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
@@ -280,7 +280,7 @@
* Confirms jQuery UI assets load as expected.
*
* Compares the jQuery assets that currently load against a list of the assets
- * that loaded prior to the deprecation of all remaining core jQuery UI
+ * that loaded prior to the the deprecation of all remaining core jQuery UI
* libraries.
*
* While this is similar to testLibraryAssetLoadingOrder(), it is a separate
@@ -288,7 +288,7 @@
* Confirms jQuery UI assets load as expected.
*
* Compares the jQuery assets that currently load against a list of the assets
- * that loaded prior to the the deprecation of all remaining core jQuery UI
+ * that loaded prior to the deprecation of all remaining core jQuery UI
* libraries.
*
* While this is similar to testLibraryAssetLoadingOrder(), it is a separate
only in patch2:
unchanged:
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -415,7 +415,7 @@ drupal.autocomplete:
misc/autocomplete.js: { weight: -1 }
# The remaining JavaScript assets previously came from core/jquery.ui, a
# deprecated library.
- # All weights are based on on the requirements defined within each file.
+ # All weights are based on the requirements defined within each file.
# @todo replace with solution in https://drupal.org/node/3076171
assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
@@ -527,7 +527,7 @@ drupal.dialog:
misc/dialog/dialog.jquery-ui.js: {}
# The remaining JavaScript assets previously came from core/jquery.ui, a
# deprecated library.
- # All weights are based on on the requirements defined within each file.
+ # All weights are based on the requirements defined within each file.
# @todo replace with solution in https://drupal.org/node/2158943
assets/vendor/jquery.ui/ui/widgets/dialog-min.js: { weight: -11.4, minified: true }
assets/vendor/jquery.ui/ui/widgets/button-min.js: { weight: -11.5, minified: true }
@@ -978,7 +978,7 @@ jquery.ui.dialog:
version: *jquery_ui_version
license: *jquery_ui_license
js:
- # All weights are based on on the requirements defined within each file.
+ # All weights are based on the requirements defined within each file.
assets/vendor/jquery.ui/ui/widgets/dialog-min.js: { weight: -11.4, minified: true }
assets/vendor/jquery.ui/ui/widgets/button-min.js: { weight: -11.5, minified: true }
assets/vendor/jquery.ui/ui/widgets/checkboxradio-min.js: { weight: -11.6, minified: true }
only in patch2:
unchanged:
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -9,7 +9,7 @@
use Drupal\Core\File\FileSystemInterface;
/**
- * @defgroup file File interface
+ * @defgroup file interface
* @{
* Common file handling functions.
*/
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Database/Database.php
+++ b/core/lib/Drupal/Core/Database/Database.php
@@ -443,7 +443,7 @@ public static function closeConnection($target = NULL, $key = NULL) {
unset(self::$connections[$key]);
}
// Force garbage collection to run. This ensures that client connection
- // objects and results in the connection being being closed are destroyed.
+ // objects and results in the connection being closed are destroyed.
gc_collect_cycles();
}
only in patch2:
unchanged:
--- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -525,7 +525,7 @@ public function testExtensionValidation() {
$this->submitForm([], 'Import all');
$this->assertSession()->pageTextContains('The configuration cannot be imported because it failed validation for the following reasons:');
$this->assertSession()->pageTextContains('Unable to uninstall the Text module since the Node module is installed.');
- $this->assertSession()->pageTextContains('Unable to uninstall the Theme test base theme theme since the Theme test subtheme theme is installed.');
+ $this->assertSession()->pageTextContains('Unable to uninstall the Theme test base theme since the Theme test subtheme theme is installed.');
$this->assertSession()->pageTextContains('Unable to install the does_not_exist module since it does not exist.');
$this->assertSession()->pageTextContains('Unable to install the does_not_exist theme since it does not exist.');
}
only in patch2:
unchanged:
--- a/core/modules/help_topics/help_topics/core.content_structure.html.twig
+++ b/core/modules/help_topics/help_topics/core.content_structure.html.twig
@@ -17,7 +17,7 @@ top_level: true
{% trans %}Boolean, Number (provided by the core system): Stores true/false values and numbers{% endtrans %}
{% trans %}Comment (provided by the core Comment module): Allows users to add comments to an entity{% endtrans %}
{% trans %}Date, Timestamp (Datetime module): Stores dates and times{% endtrans %}
-
{% trans %}Date range (Datetime range module): Stores time/date periods with a start and and an end{% endtrans %}
+
{% trans %}Date range (Datetime range module): Stores time/date periods with a start and an end{% endtrans %}
{% trans %}Email (core system): Stores email addresses{% endtrans %}
{% trans %}Link (Link module): Stores URLs and link text{% endtrans %}
{% trans %}List (Options module): Stores values chosen from pre-defined lists, where the values can be numbers or text; see section below for more on list fields.{% endtrans %}
only in patch2:
unchanged:
--- a/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
@@ -337,7 +337,7 @@ protected function setUpFields(EntityInterface $entity, UserInterface $account)
$entity = $reloaded_entity;
// Set a default value on the fields.
- $entity->set('field_rest_test', ['value' => 'All the faith he had had had had no effect on the outcome of his life.']);
+ $entity->set('field_rest_test', ['value' => 'All the faith he had no effect on the outcome of his life.']);
$entity->set('field_jsonapi_test_entity_ref', ['user' => $account->id()]);
$entity->set('field_rest_test_multivalue', [['value' => 'One'], ['value' => 'Two']]);
$entity->save();
@@ -2370,7 +2370,7 @@ public function testPatchIndividual() {
// Ensure that fields do not get deleted if they're not present in the PATCH
// request. Test this using the configurable field that we added, but which
// is not sent in the PATCH request.
- $this->assertSame('All the faith he had had had had no effect on the outcome of his life.', $updated_entity->get('field_rest_test')->value);
+ $this->assertSame('All the faith he had no effect on the outcome of his life.', $updated_entity->get('field_rest_test')->value);
// Multi-value field: remove item 0. Then item 1 becomes item 0.
$doc_multi_value_tests = $this->getPatchDocument();
only in patch2:
unchanged:
--- a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
+++ b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
@@ -249,23 +249,23 @@ public function providerTestAccessWithoutBundles() {
[],
];
$data['override permissions'] = [
- ['configure all user user layout overrides'],
+ ['configure all user layout overrides'],
FALSE,
TRUE,
TRUE,
[
- 'configure all user user layout overrides' => [
+ 'configure all user layout overrides' => [
'config' => ['core.entity_view_display.user.user.default'],
],
],
];
$data['editable override permissions'] = [
- ['configure editable user user layout overrides'],
+ ['configure editable user layout overrides'],
FALSE,
FALSE,
TRUE,
[
- 'configure all user user layout overrides' => [
+ 'configure all user layout overrides' => [
'config' => ['core.entity_view_display.user.user.default'],
],
],
only in patch2:
unchanged:
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -229,7 +229,7 @@ public function setUp() {
$this->entity = $reloaded_entity;
// Set a default value on the fields.
- $this->entity->set('field_rest_test', ['value' => 'All the faith they had had had had no effect on the outcome of their life.']);
+ $this->entity->set('field_rest_test', ['value' => 'All the faith they had no effect on the outcome of their life.']);
$this->entity->set('field_rest_test_multivalue', [['value' => 'One'], ['value' => 'Two']]);
$this->entity->set('rest_test_validation', ['value' => 'allowed value']);
$this->entity->save();
@@ -1071,7 +1071,7 @@ public function testPatch() {
// Ensure that fields do not get deleted if they're not present in the PATCH
// request. Test this using the configurable field that we added, but which
// is not sent in the PATCH request.
- $this->assertSame('All the faith they had had had had no effect on the outcome of their life.', $updated_entity->get('field_rest_test')->value);
+ $this->assertSame('All the faith they had no effect on the outcome of their life.', $updated_entity->get('field_rest_test')->value);
// Multi-value field: remove item 0. Then item 1 becomes item 0.
$normalization_multi_value_tests = $this->getNormalizedPatchEntity();
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php
+++ b/core/modules/system/tests/src/Functional/Module/NonStableModulesTest.php
@@ -186,10 +186,10 @@ public function testDeprecatedConfirmForm(): void {
$assert = $this->assertSession();
$assert->pageTextNotContains('Deprecated module has been enabled.');
$assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.');
- $assert->pageTextContains('The Deprecated module module is deprecated');
+ $assert->pageTextContains('The Deprecated module is deprecated');
$more_information_link = $assert->elementExists('named', [
'link',
- 'The Deprecated module module is deprecated. (more information)',
+ 'The Deprecated module is deprecated. (more information)',
]);
$this->assertEquals('http://example.com/deprecated', $more_information_link->getAttribute('href'));
@@ -220,7 +220,7 @@ public function testDeprecatedConfirmForm(): void {
// list of the deprecated modules with only this one.
$assert->pageTextNotContains('2 modules have been enabled: Deprecated module dependency, Deprecated module');
$assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.');
- $assert->pageTextContains('The Deprecated module module is deprecated');
+ $assert->pageTextContains('The Deprecated module is deprecated');
// There should be a warning about enabling deprecated modules, but no
// warnings about experimental modules.
@@ -232,7 +232,7 @@ public function testDeprecatedConfirmForm(): void {
$assert->pageTextNotContains('The Deprecated module dependency module is deprecated');
// There should be a message about enabling dependencies.
- $assert->pageTextContains('You must enable the Deprecated module module to install Deprecated module dependency');
+ $assert->pageTextContains('You must enable the Deprecated module to install Deprecated module dependency');
// Enable the module and confirm that it worked.
$this->submitForm([], 'Continue');
@@ -296,7 +296,7 @@ public function testDeprecatedConfirmForm(): void {
// list of the deprecated modules with only this one.
$assert->pageTextNotContains('2 modules have been enabled: Deprecated module dependency, Deprecated module');
$assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.');
- $assert->pageTextContains('The Deprecated module module is deprecated');
+ $assert->pageTextContains('The Deprecated module is deprecated');
// There should be a warning about enabling deprecated modules, but no
// warnings about experimental modules.
@@ -362,10 +362,10 @@ public function testDeprecatedAndExperimentalConfirmForm(): void {
$assert = $this->assertSession();
$assert->pageTextNotContains('Deprecated module has been enabled.');
$assert->pageTextContains('Deprecated modules are modules that may be removed from the next major release of Drupal core. Use at your own risk.');
- $assert->pageTextContains('The Deprecated module module is deprecated');
+ $assert->pageTextContains('The Deprecated module is deprecated');
$more_information_link = $assert->elementExists('named', [
'link',
- 'The Deprecated module module is deprecated. (more information)',
+ 'The Deprecated module is deprecated. (more information)',
]);
$this->assertEquals('http://example.com/deprecated', $more_information_link->getAttribute('href'));
only in patch2:
unchanged:
--- a/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php
+++ b/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php
@@ -135,9 +135,9 @@ private function assertToolTipMarkup(int $index, string $nub_position, string $j
*/
public function providerTestTourTipMarkup() {
return [
- 'Using the the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'],
+ 'Using the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'],
'Using current TourTipPlugin with Stable theme' => ['tour-test-1'],
- 'Using the the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'],
+ 'Using the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'],
'Using current TourTipPlugin with Stable 9 theme' => ['tour-test-1', 'stable9'],
];
}
only in patch2:
unchanged:
--- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -139,7 +139,7 @@ public function testCRUD() {
$this->assertTrue($same_id->isNew());
try {
$same_id->save();
- $this->fail('Not possible to overwrite an entity entity.');
+ $this->fail('Not possible to overwrite an entity.');
}
catch (EntityStorageException $e) {
// Expected exception; just continue testing.
only in patch2:
unchanged:
--- a/core/themes/olivero/css/components/header-search-narrow.css
+++ b/core/themes/olivero/css/components/header-search-narrow.css
@@ -159,7 +159,7 @@
background-color: transparent
/*
- When in Windows high contrast mode, FF will will not output either background
+ When in Windows high contrast mode, FF will not output either background
images or SVGs that are nested directly within a