diff -u b/core/lib/Drupal/Core/Form/FormValidator.php b/core/lib/Drupal/Core/Form/FormValidator.php --- b/core/lib/Drupal/Core/Form/FormValidator.php +++ b/core/lib/Drupal/Core/Form/FormValidator.php @@ -345,7 +345,7 @@ $value = in_array($elements['#type'], ['checkboxes', 'tableselect']) ? array_keys($elements['#value']) : $elements['#value']; foreach ($value as $v) { if (!isset($options[$v])) { - $form_state->setError($elements, $this->t('An invalid choice has been detected. Please, contact the site administrator.')); + $form_state->setError($elements, $this->t('An invalid choice has been detected. Please contact the site administrator.')); $this->logger->error('Illegal choice %choice in %name element.', ['%choice' => $v, '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']]); } } @@ -364,7 +364,7 @@ $form_state->setValueForElement($elements, NULL); } elseif (!isset($options[$elements['#value']])) { - $form_state->setError($elements, $this->t('An invalid choice has been detected. Please, contact the site administrator.')); + $form_state->setError($elements, $this->t('An invalid choice has been detected. Please contact the site administrator.')); $this->logger->error('Illegal choice %choice in %name element.', ['%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']]); } } diff -u b/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php b/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php --- b/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php +++ b/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php @@ -44,7 +44,7 @@ // Switch to a theme that doesn't contain the region selected above. $assert_session->selectExists('Theme')->selectOption('stark'); $assert_session->assertWaitOnAjaxRequest(); - $assert_session->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator..'); + $assert_session->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator..'); $assert_session->optionExists('Region', '- Select -'); } diff -u b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php --- b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php +++ b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php @@ -165,7 +165,7 @@ $this->drupalGet('admin/config/people/accounts/fields/user.user.field_user_comment/storage'); $this->submitForm($edit, 'Save field settings'); // We should get an error message. - $this->assertSession()->pageTextContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextContains('An invalid choice has been detected. Please contact the site administrator.'); // Create a comment type for users. $bundle = CommentType::create([ @@ -183,7 +183,7 @@ $this->drupalGet('admin/config/people/accounts/fields/user.user.field_user_comment/storage'); $this->submitForm($edit, 'Save field settings'); // We shouldn't get an error message. - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator..'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator..'); } /** diff -u b/core/modules/system/tests/src/Functional/Form/ValidationTest.php b/core/modules/system/tests/src/Functional/Form/ValidationTest.php --- b/core/modules/system/tests/src/Functional/Form/ValidationTest.php +++ b/core/modules/system/tests/src/Functional/Form/ValidationTest.php @@ -235,7 +235,7 @@ $this->assertSession()->pageTextContains((string) $form[$key]['#form_test_required_error']); } } - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator.'); // Verify that no custom validation error appears with valid values. $edit = [ @@ -256,7 +256,7 @@ $this->assertSession()->pageTextNotContains((string) $form[$key]['#form_test_required_error']); } } - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator.'); } } diff -u b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php --- b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php @@ -109,7 +109,7 @@ // checked. $this->clickLink('Page 2'); $this->assertSession()->elementsCount('xpath', "//div[contains(@class, 'views-row')]", 1); - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator.'); } /** @@ -158,14 +158,14 @@ // All rows are displayed by default on the first page when no options are // checked. $this->assertSession()->elementsCount('xpath', "//div[contains(@class, 'views-row')]", 8); - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator.'); // Select one option and ensure we still have results. $tid = $this->terms[0]->id(); $this->submitForm(["tid[$tid]" => $tid], 'Apply'); // Ensure only nodes tagged with $tid are displayed. $this->assertSession()->elementsCount('xpath', "//div[contains(@class, 'views-row')]", 2); - $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please, contact the site administrator.'); + $this->assertSession()->pageTextNotContains('An invalid choice has been detected. Please contact the site administrator.'); } } diff -u b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php --- b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php @@ -424,7 +424,7 @@ '#value' => 'baz', '#multiple' => FALSE, ], - 'An invalid choice has been detected. Please, contact the site administrator.', + 'An invalid choice has been detected. Please contact the site administrator.', TRUE, ], [ @@ -437,7 +437,7 @@ '#value' => ['baz'], '#multiple' => TRUE, ], - 'An invalid choice has been detected. Please, contact the site administrator.', + 'An invalid choice has been detected. Please contact the site administrator.', TRUE, ], [ @@ -450,7 +450,7 @@ '#value' => ['baz'], '#multiple' => TRUE, ], - 'An invalid choice has been detected. Please, contact the site administrator.', + 'An invalid choice has been detected. Please contact the site administrator.', TRUE, ], [ only in patch2: unchanged: --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "composer/installers": "^2.0", "drupal/core": "self.version", "drupal/core-project-message": "self.version", - "drupal/core-vendor-hardening": "self.version" + "drupal/core-vendor-hardening": "self.version", + "drupal/admin_toolbar": "^3.1" }, "require-dev": { "behat/mink": "^1.10", only in patch2: unchanged: --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "85fce9014bf3bc99add14de1104ac465", + "content-hash": "68167c5d62009bed340481c784f7e381", "packages": [ { "name": "asm89/stack-cors", @@ -441,6 +441,87 @@ "time": "2022-02-28T11:07:21+00:00" }, { + "name": "drupal/admin_toolbar", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/admin_toolbar.git", + "reference": "3.3.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.3.0.zip", + "reference": "3.3.0", + "shasum": "8e61fba9c9d83a94a844cff96d00871878a7eb98" + }, + "require": { + "drupal/core": "^9.2 || ^10" + }, + "require-dev": { + "drupal/admin_toolbar_tools": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.3.0", + "datestamp": "1669567837", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Wilfrid Roze (eme)", + "homepage": "https://www.drupal.org/u/eme", + "role": "Maintainer" + }, + { + "name": "Romain Jarraud (romainj)", + "homepage": "https://www.drupal.org/u/romainj", + "role": "Maintainer" + }, + { + "name": "Adrian Cid Almaguer (adriancid)", + "homepage": "https://www.drupal.org/u/adriancid", + "email": "adriancid@gmail.com", + "role": "Maintainer" + }, + { + "name": "Mohamed Anis Taktak (matio89)", + "homepage": "https://www.drupal.org/u/matio89", + "role": "Maintainer" + }, + { + "name": "matio89", + "homepage": "https://www.drupal.org/user/2320090" + }, + { + "name": "Musa.thomas", + "homepage": "https://www.drupal.org/user/1213824" + }, + { + "name": "romainj", + "homepage": "https://www.drupal.org/user/370706" + } + ], + "description": "Provides a drop-down menu interface to the core Drupal Toolbar.", + "homepage": "http://drupal.org/project/admin_toolbar", + "keywords": [ + "Drupal", + "Toolbar" + ], + "support": { + "source": "https://git.drupalcode.org/project/admin_toolbar", + "issues": "https://www.drupal.org/project/issues/admin_toolbar" + } + }, + { "name": "drupal/core", "version": "10.1.x-dev", "dist": { only in patch2: unchanged: --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -12,6 +12,7 @@ "composer/semver": "~3.3.2", "doctrine/annotations": "~1.14.2", "doctrine/lexer": "~1.2.3", + "drupal/admin_toolbar": "~3.3.0", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~7.5.0", "guzzlehttp/promises": "~1.5.2",