diff --git a/composer.lock b/composer.lock
index e75dc0698542eba6294719e15fb200d2c56d6ae9..11b5e08089725f3e3ff0d1bc2eb91068c19ce595 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6994,16 +6994,16 @@
},
{
"name": "symfony/phpunit-bridge",
- "version": "v5.1.4",
+ "version": "v5.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "3229133c5f966d50a741a668e54b34c1368200a0"
+ "reference": "6753ea4cb2dab705e819b1ddd8833a5c98338650"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3229133c5f966d50a741a668e54b34c1368200a0",
- "reference": "3229133c5f966d50a741a668e54b34c1368200a0",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/6753ea4cb2dab705e819b1ddd8833a5c98338650",
+ "reference": "6753ea4cb2dab705e819b1ddd8833a5c98338650",
"shasum": ""
},
"require": {
@@ -7012,6 +7012,9 @@
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2"
},
+ "require-dev": {
+ "symfony/deprecation-contracts": "^2.1"
+ },
"suggest": {
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
},
@@ -7069,7 +7072,7 @@
"type": "tidelift"
}
],
- "time": "2020-08-28T16:19:35+00:00"
+ "time": "2020-09-18T14:27:32+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index f032858e0a910d2928f94dcff3cb051117ecbf28..d49579d3d2ba61774b18f29d9e88848073274b8b 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -57,7 +57,7 @@
"symfony/filesystem": "v4.4.12",
"symfony/finder": "v4.4.12",
"symfony/lock": "v4.4.12",
- "symfony/phpunit-bridge": "v5.1.4",
+ "symfony/phpunit-bridge": "v5.1.6",
"theseer/tokenizer": "1.2.0",
"webmozart/assert": "1.9.1"
}
diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 59dbd49bc034f214b96542b213d6e55c3c2d8346..bb9593992eadc922340ee3b2d6743672f0943435 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -500,11 +500,6 @@ re-architect or otherwise improve large areas of Drupal core. See
https://www.drupal.org/community-initiatives/drupal-core for more information on
their responsibilities. The initiative coordinators for Drupal 8 are:
-API-first Initiative
-- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
-- Mateu Aguiló Bosch 'e0ipso' https://www.drupal.org/u/e0ipso
-- Gabe Sullice 'gabesullice' https://www.drupal.org/u/gabesullice
-
Admin UI & JavaScript Modernisation Initiative
- Cristina Chumillas 'ckrina' https://www.drupal.org/u/ckrina
- Sally Young 'justafish' https://www.drupal.org/u/justafish
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 819a4d9ae29c02d2a433f9a77e4b507881fc94ac..ca129be8275805e2f317c91c86197d738efc08f1 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -299,13 +299,10 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia
* (optional) The filename that the error was raised in.
* @param $line
* (optional) The line number the error was raised at.
- * @param $context
- * (optional) An array that points to the active symbol table at the point the
- * error occurred.
*/
-function _drupal_error_handler($error_level, $message, $filename = NULL, $line = NULL, $context = NULL) {
+function _drupal_error_handler($error_level, $message, $filename = NULL, $line = NULL) {
require_once __DIR__ . '/errors.inc';
- _drupal_error_handler_real($error_level, $message, $filename, $line, $context);
+ _drupal_error_handler_real($error_level, $message, $filename, $line);
}
/**
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index cb5edf21808fa3f5b41b457deaa94cbdeaebc2e0..23ed7d4bb7880033e731c07eada81bec011e1482 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -54,11 +54,8 @@ function drupal_error_levels() {
* The filename that the error was raised in.
* @param $line
* The line number the error was raised at.
- * @param $context
- * An array that points to the active symbol table at the point the error
- * occurred.
*/
-function _drupal_error_handler_real($error_level, $message, $filename, $line, $context) {
+function _drupal_error_handler_real($error_level, $message, $filename, $line) {
if ($error_level & error_reporting()) {
$types = drupal_error_levels();
list($severity_msg, $severity_level) = $types[$error_level];
diff --git a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
index 061460219c18acedeb156e068ffaa331100a3a66..d19031747430dd83ac716e3b7ca3a677b3b072cb 100644
--- a/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
+++ b/core/lib/Drupal/Core/Access/CsrfTokenGenerator.php
@@ -86,8 +86,14 @@ public function validate($token, $value = '') {
if (empty($seed)) {
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.
+ if (!is_string($token)) {
+ return FALSE;
+ }
- return hash_equals($this->computeToken($seed, $value), $token);
+ return hash_equals($value, $token);
}
/**
diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
index eb5bad48753da4a092508a41e2b6e87687ec32c7..d72c58477390d9df730dd84524dd563855e47480 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
@@ -136,6 +136,11 @@ protected function applyLibrariesExtend($extension, $library_name, $library_defi
$libraries_extend = $this->themeManager->getActiveTheme()->getLibrariesExtend();
if (!empty($libraries_extend["$extension/$library_name"])) {
foreach ($libraries_extend["$extension/$library_name"] as $library_extend_name) {
+ if (isset($library_definition['deprecated'])) {
+ $extend_message = sprintf('Theme "%s" is extending a deprecated library.', $extension);
+ $library_deprecation = str_replace('%library_id%', "$extension/$library_name", $library_definition['deprecated']);
+ @trigger_error("$extend_message $library_deprecation", E_USER_DEPRECATED);
+ }
if (!is_string($library_extend_name)) {
// Only string library names are allowed.
throw new InvalidLibrariesExtendSpecificationException('The libraries-extend specification for each library must be a list of strings.');
diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index 8ac717efcc14d41d33377181e1763dd16af55042..8aff0c9375416a4be1547fdcf124ab2e6ec5bd61 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -382,6 +382,11 @@ protected function applyLibrariesOverride($libraries, $extension) {
foreach ($libraries as $library_name => $library) {
// Process libraries overrides.
if (isset($libraries_overrides["$extension/$library_name"])) {
+ if (isset($library['deprecated'])) {
+ $override_message = sprintf('Theme "%s" is overriding a deprecated library.', $extension);
+ $library_deprecation = str_replace('%library_id%', "$extension/$library_name", $library['deprecated']);
+ @trigger_error("$override_message $library_deprecation", E_USER_DEPRECATED);
+ }
// Active theme defines an override for this library.
$override_definition = $libraries_overrides["$extension/$library_name"];
if (is_string($override_definition) || $override_definition === FALSE) {
diff --git a/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/core/lib/Drupal/Core/Entity/EntityResolverManager.php
index c10d72f551017e8ba1dc94715589e3885b507fe8..7b4f04034180abcf76c2f767e407f23115d6af7c 100644
--- a/core/lib/Drupal/Core/Entity/EntityResolverManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityResolverManager.php
@@ -74,6 +74,10 @@ protected function getControllerClass(array $defaults) {
}
}
+ if ($controller === NULL) {
+ return NULL;
+ }
+
if (strpos($controller, ':') === FALSE) {
if (method_exists($controller, '__invoke')) {
return [$controller, '__invoke'];
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index 1178cb007b962d7815f232c58b94f18c388e13e8..40493f7402871d2ab6c175957e052eac901b4504 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -233,7 +233,7 @@ public static function postDelete(EntityStorageInterface $storage, array $field_
* @param string $field_name
* Name of the field.
*
- * @return static
+ * @return \Drupal\Core\Field\FieldConfigInterface|null
* The base field bundle override config entity if one exists for the
* provided field name, otherwise NULL.
*/
diff --git a/core/lib/Drupal/Core/Render/Element/FormElement.php b/core/lib/Drupal/Core/Render/Element/FormElement.php
index cbec8e9b4a10490c5484d5c8d8477e202970f837..62fe3c1112cf11f6eecfc7ac4f5a483c562e1c0a 100644
--- a/core/lib/Drupal/Core/Render/Element/FormElement.php
+++ b/core/lib/Drupal/Core/Render/Element/FormElement.php
@@ -46,10 +46,16 @@
* are called to validate the input. Arguments: $element, $form_state, $form.
* - #field_prefix: (string) Prefix to display before the HTML input element.
* Should be translated, normally. If it is not already wrapped in a safe
- * markup object, will be filtered for XSS safety.
+ * markup object, will be filtered for XSS safety. Note that the contents of
+ * this prefix are wrapped in a <span> element, so the value should not
+ * contain block level HTML. Any HTML added must be valid, i.e. any tags
+ * introduced inside this prefix must also be terminated within the prefix.
* - #field_suffix: (string) Suffix to display after the HTML input element.
* Should be translated, normally. If it is not already wrapped in a safe
- * markup object, will be filtered for XSS safety.
+ * markup object, will be filtered for XSS safety. Note that the contents of
+ * this suffix are wrapped in a <span> element, so the value should not
+ * contain block level HTML. Any HTML must also be valid, i.e. any tags
+ * introduce inside this suffix must also be terminated within the suffix.
* - #input: (bool, internal) Whether or not the element accepts input.
* - #parents: (string[], read-only) Array of names of the element's parents
* for purposes of getting values out of $form_state. See also
diff --git a/core/lib/Drupal/Core/Security/PharExtensionInterceptor.php b/core/lib/Drupal/Core/Security/PharExtensionInterceptor.php
index 0d8e8e8304c145c5aa00bb5a1651833febe2120a..6f6e161e669d048c5f79ed9ef67eb355dce82622 100644
--- a/core/lib/Drupal/Core/Security/PharExtensionInterceptor.php
+++ b/core/lib/Drupal/Core/Security/PharExtensionInterceptor.php
@@ -60,8 +60,8 @@ private function baseFileContainsPharExtension($path) {
return FALSE;
}
// If the stream wrapper is registered by invoking a phar file that does
- // not not have .phar extension then this should be allowed. For
- // example, some CLI tools recommend removing the extension.
+ // not have .phar extension then this should be allowed. For example, some
+ // CLI tools recommend removing the extension.
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
// Find the last entry in the backtrace containing a 'file' key as
// sometimes the last caller is executed outside the scope of a file. For
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 49e1153359f39cec4a2f529db2e2532890394587..60bf595626bbbb5e3fb3d781789acf4f4bd10cfd 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -109,6 +109,7 @@ autoloader
autoloaders
autoloading
autop
+autoplace
autoplay
autoreply
autosave
diff --git a/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php b/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
index 74d2654ad9d5b986dd9afc8d09f3d3a4668cdefd..7b8754f8fd1446e1e1e40b61cc8cc64f4c0c7252 100644
--- a/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
+++ b/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
@@ -69,26 +69,23 @@ public function testOverviewPage() {
$feed = $this->createFeed($this->getRSS091Sample());
$this->drupalGet('admin/config/services/aggregator');
- $result = $this->xpath('//table/tbody/tr');
// Check if the amount of feeds in the overview matches the amount created.
- $this->assertCount(1, $result, 'Created feed is found in the overview');
+ $this->assertSession()->elementsCount('xpath', '//table/tbody/tr', 1);
+
// Check if the fields in the table match with what's expected.
- $link = $this->xpath('//table/tbody/tr//td[1]/a');
- $this->assertEquals($feed->label(), $link[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//table/tbody/tr//td[1]/a', $feed->label());
$count = $this->container->get('entity_type.manager')->getStorage('aggregator_item')->getItemCount($feed);
- $td = $this->xpath('//table/tbody/tr//td[2]');
- $this->assertEquals(\Drupal::translation()->formatPlural($count, '1 item', '@count items'), $td[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//table/tbody/tr//td[2]', \Drupal::translation()->formatPlural($count, '1 item', '@count items'));
// Update the items of the first feed.
$feed->refreshItems();
$this->drupalGet('admin/config/services/aggregator');
- $result = $this->xpath('//table/tbody/tr');
+ $this->assertSession()->elementsCount('xpath', '//table/tbody/tr', 1);
+
// Check if the fields in the table match with what's expected.
- $link = $this->xpath('//table/tbody/tr//td[1]/a');
- $this->assertEquals($feed->label(), $link[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//table/tbody/tr//td[1]/a', $feed->label());
$count = $this->container->get('entity_type.manager')->getStorage('aggregator_item')->getItemCount($feed);
- $td = $this->xpath('//table/tbody/tr//td[2]');
- $this->assertEquals(\Drupal::translation()->formatPlural($count, '1 item', '@count items'), $td[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//table/tbody/tr//td[2]', \Drupal::translation()->formatPlural($count, '1 item', '@count items'));
}
}
diff --git a/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php b/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
index 5d2fc211ad5bfe82d43a3f001807f00d763c146f..3a45862aa095740807a6d389a92a74a07fe85e78 100644
--- a/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\aggregator\Functional;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\views\Entity\View;
/**
@@ -69,8 +68,8 @@ public function testBlockLinks() {
// Visit that page.
$this->drupalGet($feed->toUrl()->getInternalPath());
- $correct_titles = $this->xpath('//h1[normalize-space(text())=:title]', [':title' => $feed->label()]);
- $this->assertFalse(empty($correct_titles), 'Aggregator feed page is available and has the correct title.');
+ // Verify that aggregator feed page is available and has the correct title.
+ $this->assertSession()->elementTextContains('xpath', '//h1', $feed->label());
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_feed:' . $feed->id());
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_feed_view');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_item_view');
@@ -102,18 +101,15 @@ public function testFeedPage() {
// Check for presence of an aggregator pager.
$this->drupalGet('aggregator');
- $elements = $this->xpath("//ul[contains(@class, :class)]", [':class' => 'pager__items']);
- $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
+ $this->assertSession()->elementExists('xpath', '//ul[contains(@class, "pager__items")]');
// Check for sources page title.
$this->drupalGet('aggregator/sources');
- $titles = $this->xpath('//h1[normalize-space(text())=:title]', [':title' => 'Sources']);
- $this->assertTrue(!empty($titles), 'Source page contains correct title.');
+ $this->assertSession()->elementTextContains('xpath', '//h1', 'Sources');
// Find the expected read_more link on the sources page.
$href = $feed->toUrl()->toString();
- $links = $this->xpath('//a[@href = :href]', [':href' => $href]);
- $this->assertTrue(isset($links[0]), new FormattableMarkup('Link to href %href found.', ['%href' => $href]));
+ $this->assertSession()->linkByHrefExists($href);
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_feed:' . $feed->id());
// Check the rss aggregator page as anonymous user.
@@ -140,8 +136,7 @@ public function testFeedPage() {
// Check for the presence of a pager.
$this->drupalGet('aggregator/sources/' . $feed->id());
- $elements = $this->xpath("//ul[contains(@class, :class)]", [':class' => 'pager__items']);
- $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
+ $this->assertSession()->elementExists('xpath', '//ul[contains(@class, "pager__items")]');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_feed:' . $feed->id());
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_feed_view');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'aggregator_item_view');
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index 51697f01a2527817f9c41361e4db0255571384a4..6c9dc0115f0a403efe2118f1b0fcbb879fad2b7d 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -611,7 +611,7 @@ public function testHasTranslation(array $mock_return_values, $expected) {
}
/**
- * Provides data for for ConfigNamesMapperTest::testHasTranslation().
+ * Provides data for ConfigNamesMapperTest::testHasTranslation().
*
* @return array
* An array of arrays, where each inner array has an array of values that
diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php
index 09e67a3caf5c3ce2e0111df20aa7f25092305056..439e5077bfe18427e1b3bd157346aa72e7d7fe05 100644
--- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php
+++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php
@@ -144,7 +144,7 @@ function ($module, $key, $to, $langcode, $params, $from) use (&$results) {
$this->assertEquals($key, $result['key']);
$this->assertEquals($to, $result['to']);
$this->assertEquals($langcode, $result['langcode']);
- $this->assertArrayEquals($params, $result['params']);
+ $this->assertEquals($params, $result['params']);
$this->assertEquals($from, $result['from']);
});
$this->userStorage->expects($this->any())
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 2e06d2a4727633c5a94d0d17031481c374e61a9e..f69612774ecb9130d28b9eff4f4de11fc6b3ecb7 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -366,7 +366,7 @@ public function getUniqueIdentifier() {
* @param string $field_name
* Name of the field.
*
- * @return static
+ * @return Drupal\field\Entity\FieldConfigInterface|null
* The field config entity if one exists for the provided field
* name, otherwise NULL.
*/
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 250edd6e8dc697aa79b4cd9e516e83c1bb23a097..86c3f4f1efcbdd523bb39a33f2fc2435968343b1 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -796,7 +796,7 @@ protected function getFieldItemClass() {
* @param string $field_name
* Name of the field.
*
- * @return static
+ * @return \Drupal\field\FieldStorageConfigInterface|null
* The field config entity if one exists for the provided field name,
* otherwise NULL.
*/
diff --git a/core/modules/field/src/Plugin/migrate/process/d6/FieldOptionTranslation.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldOptionTranslation.php
index 05bb2ad0d626f7946b327b2065462d7f3ee7483c..8432c2b26256a9606eb4e0977fe19702b06c974e 100644
--- a/core/modules/field/src/Plugin/migrate/process/d6/FieldOptionTranslation.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldOptionTranslation.php
@@ -40,7 +40,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
$i = 0;
foreach ($list as $allowed_value) {
// Get the key for this allowed value which may be a key|label pair
- // or or just key.
+ // or just key.
$value = explode("|", $allowed_value);
if (isset($value[0]) && ($value[0] == $option)) {
$allowed_values = ['label' => $row->getSourceProperty('translation')];
diff --git a/core/modules/field/tests/src/Functional/Boolean/BooleanFieldTest.php b/core/modules/field/tests/src/Functional/Boolean/BooleanFieldTest.php
index 42773538502b1ecd5bac4fd24f62ad631568c27a..d2c4f123d0340c008e3182662dcbf28f4b66b8b1 100644
--- a/core/modules/field/tests/src/Functional/Boolean/BooleanFieldTest.php
+++ b/core/modules/field/tests/src/Functional/Boolean/BooleanFieldTest.php
@@ -165,7 +165,7 @@ public function testBooleanField() {
// Enable setting.
$edit = ['fields[' . $field_name . '][settings_edit_form][settings][display_label]' => 1];
$this->drupalPostForm(NULL, $edit, $field_name . "_plugin_settings_update");
- $this->drupalPostForm(NULL, NULL, 'Save');
+ $this->drupalPostForm(NULL, [], 'Save');
// Go again to the form display page and check if the setting
// is stored and has the expected effect.
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index dfcce6981d79d6923bacf4c068aaecc8f3cd6643..1ab2db16b7124b238f0534322c6600b0e00a4b38 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -103,7 +103,7 @@ public function testFieldAdminHandler() {
'name[node_field_data.nid]' => 1,
];
$this->drupalPostForm('admin/structure/views/nojs/add-handler/node_test_view/entity_reference_1/sort', $edit, t('Add and configure sort criteria'));
- $this->drupalPostForm(NULL, NULL, t('Apply'));
+ $this->drupalPostForm(NULL, [], t('Apply'));
$this->drupalPostForm('admin/structure/views/view/node_test_view/edit/entity_reference_1', [], t('Save'));
$this->clickLink(t('Settings'));
diff --git a/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
index 6efc3232a46dd8bf3291a1ad06d503e39bc08d8b..497cf4f6f18ed51bebeb33703149e3abae4e8b47 100644
--- a/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
@@ -88,7 +88,7 @@ public function testFieldAdminHandler() {
$page->findField('new_storage_type')->setValue('entity_reference');
$assert_session->waitForField('label')->setValue('Test');
- $machine_name = $assert_session->waitForElement('xpath', '//*[@id="edit-label-machine-name-suffix"]/span[2]/span[contains(text(), "field_test")]');
+ $machine_name = $assert_session->waitForElement('xpath', '//*[@id="edit-label-machine-name-suffix"]/span[contains(text(), "field_test")]');
$this->assertNotEmpty($machine_name);
$page->pressButton('Save and continue');
diff --git a/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
index 7ff24c783fe2f53bb4820fa454bb1a9338c2defc..c4af96099c9be0edecb13b5b49d4e48d2706eb28 100644
--- a/core/modules/field_ui/src/Form/FieldStorageAddForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageAddForm.php
@@ -187,9 +187,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
$field_prefix = $this->config('field_ui.settings')->get('field_prefix');
$form['new_storage_wrapper']['field_name'] = [
'#type' => 'machine_name',
- // This field should stay LTR even for RTL languages.
- '#field_prefix' => '<span dir="ltr">' . $field_prefix,
- '#field_suffix' => '</span>‎',
+ '#field_prefix' => $field_prefix,
'#size' => 15,
'#description' => $this->t('A unique machine-readable name containing letters, numbers, and underscores.'),
// Calculate characters depending on the length of the field prefix
diff --git a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index f9317e3466d12300b666be64a4434be2ab8f8036..f949ec344250d489ea1ee2902d411037af8aeded 100644
--- a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
+++ b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -93,7 +93,7 @@ public function testEntityViewModeUI() {
// Test deleting the view mode.
$this->clickLink(t('Delete'));
$this->assertRaw(t('Are you sure you want to delete the view mode %label?', ['%label' => $edit['label']]));
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
$this->assertRaw(t('The view mode %label has been deleted.', ['%label' => $edit['label']]));
}
@@ -147,7 +147,7 @@ public function testEntityFormModeUI() {
// Test deleting the form mode.
$this->clickLink(t('Delete'));
$this->assertRaw(t('Are you sure you want to delete the form mode %label?', ['%label' => $edit['label']]));
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
$this->assertRaw(t('The form mode %label has been deleted.', ['%label' => $edit['label']]));
}
diff --git a/core/modules/file/src/Plugin/migrate/source/d7/File.php b/core/modules/file/src/Plugin/migrate/source/d7/File.php
index dc1ac2053f451730b126827f3d14c92896a05918..4e8f33417b77c7d1018a13f097b02f66dc045544 100644
--- a/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -87,7 +87,7 @@ public function prepareRow(Row $row) {
// At this point, $path could be an absolute path or a relative path,
// depending on how the scheme's variable was set. So we need to shear out
// the source_base_path in order to make them all relative.
- $path = str_replace($this->configuration['constants']['source_base_path'], NULL, $path);
+ $path = preg_replace('#' . preg_quote($this->configuration['constants']['source_base_path']) . '#', '', $path, 1);
$row->setSourceProperty('filepath', $path);
return parent::prepareRow($row);
}
diff --git a/core/modules/file/tests/src/Kernel/Plugin/migrate/source/d7/FileTest.php b/core/modules/file/tests/src/Kernel/Plugin/migrate/source/d7/FileTest.php
index 0f2046d85d9b9fe749f72b31cf02e01173074a92..50b4d346d957a7eb193f9152c98470d25e0d16e8 100644
--- a/core/modules/file/tests/src/Kernel/Plugin/migrate/source/d7/FileTest.php
+++ b/core/modules/file/tests/src/Kernel/Plugin/migrate/source/d7/FileTest.php
@@ -158,6 +158,36 @@ public function providerSource() {
'scheme' => 'public',
];
+ // Test getting only private files with absolute file private path.
+ $tests[3]['source_data'] = $tests[0]['source_data'];
+ $tests[3]['source_data']['variable'][1] = [
+ 'name' => 'file_private_path',
+ 'value' => serialize('/home/lillian/subdomains/u2/u2-private-files'),
+ ];
+ $tests[3]['expected_data'] = [
+ [
+ 'fid' => '1',
+ 'uid' => '1',
+ 'filename' => 'cube.jpeg',
+ 'uri' => 'private://cube.jpeg',
+ 'filemime' => 'image/jpeg',
+ 'filesize' => '3620',
+ 'status' => '1',
+ 'timestamp' => '1421727515',
+ 'filepath' => 'home/lillian/subdomains/u2/u2-private-files/cube.jpeg',
+ ],
+ ];
+ // Do an automatic count.
+ $tests[3]['expected_count'] = NULL;
+
+ // Set up plugin configuration.
+ $tests[3]['configuration'] = [
+ 'constants' => [
+ 'source_base_path' => '/',
+ ],
+ 'scheme' => 'private',
+ ];
+
return $tests;
}
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
index 76907b9f56edee5e9cd68ca5fe83ae0bf8f0cdae..958a9317ccce3c59573e81b87f9f42f672736dde 100644
--- a/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
@@ -248,7 +248,7 @@ public function testUninstall() {
$edit = [];
$edit['uninstall[help_topics]'] = TRUE;
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$this->drupalGet('admin/help');
$this->assertSession()->statusCodeEquals(200);
diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
index e70d8fd6e9e6dd7257e35972c2ec466768e050eb..f3d8bc2acc9ca730a7212768264e09f747b40ebd 100644
--- a/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
+++ b/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
@@ -98,7 +98,7 @@ public function testHelp() {
$session->pageTextContains('Topics can be provided by modules or themes');
$session->responseHeaderContains('X-Drupal-Cache-Tags', 'core.extension');
- // Verify links for for help topics and order.
+ // Verify links for help topics and order.
$page_text = $this->getTextContent();
$start = strpos($page_text, 'Topics can be provided');
$pos = $start;
diff --git a/core/modules/language/src/Plugin/Condition/Language.php b/core/modules/language/src/Plugin/Condition/Language.php
index bbbce837451ffcd042e98cff762df3f10807ded5..f727dc7705f1a187310bfb8d7e3402b337c138e3 100644
--- a/core/modules/language/src/Plugin/Condition/Language.php
+++ b/core/modules/language/src/Plugin/Condition/Language.php
@@ -104,7 +104,7 @@ public function summary() {
$language_list = $this->languageManager->getLanguages(LanguageInterface::STATE_ALL);
$selected = $this->configuration['langcodes'];
// Reduce the language list to an array of language names.
- $language_names = array_reduce($language_list, function (&$result, $item) use ($selected) {
+ $language_names = array_reduce($language_list, function ($result, $item) use ($selected) {
// If the current item of the $language_list array is one of the selected
// languages, add it to the $results array.
if (!empty($selected[$item->getId()])) {
diff --git a/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php b/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
index eac8695a64a37f92edd7aa3327b5a4c1e820bcc3..5a3ea7d712a4198833d9a6dd0380465e33f22032 100644
--- a/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
+++ b/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
@@ -11,7 +11,7 @@
/**
* Overrides the entity form controller service for layout builder operations.
*/
-class LayoutBuilderHtmlEntityFormController {
+class LayoutBuilderHtmlEntityFormController extends FormController {
use DependencySerializationTrait;
@@ -56,4 +56,18 @@ public function getContentResult(Request $request, RouteMatchInterface $route_ma
return $form;
}
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFormArgument(RouteMatchInterface $route_match) {
+ return $this->entityFormController->getFormArgument($route_match);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFormObject(RouteMatchInterface $route_match, $form_arg) {
+ return $this->entityFormController->getFormObject($route_match, $form_arg);
+ }
+
}
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.info.yml b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8d373e72e29e02c3d1d78b6dcf1244fc8cb6a01d
--- /dev/null
+++ b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Layout Builder Decoration test'
+type: module
+description: 'Support module for testing layout building.'
+package: Testing
+version: VERSION
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.services.yml b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.services.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3d47731f441cec798da7a9bba40bbc64eda0823a
--- /dev/null
+++ b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/layout_builder_decoration_test.services.yml
@@ -0,0 +1,6 @@
+services:
+ layout_builder_decoration_test.controller.entity_form:
+ decorates: controller.entity_form
+ class: Drupal\layout_builder_decoration_test\Controller\LayoutBuilderDecorationTestHtmlEntityFormController
+ public: false
+ arguments: ['@layout_builder_decoration_test.controller.entity_form.inner']
diff --git a/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/src/Controller/LayoutBuilderDecorationTestHtmlEntityFormController.php b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/src/Controller/LayoutBuilderDecorationTestHtmlEntityFormController.php
new file mode 100644
index 0000000000000000000000000000000000000000..79220243347a52d0e0ddc2df376bc41145927ead
--- /dev/null
+++ b/core/modules/layout_builder/tests/modules/layout_builder_decoration_test/src/Controller/LayoutBuilderDecorationTestHtmlEntityFormController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\layout_builder_decoration_test\Controller;
+
+use Drupal\Core\Controller\FormController;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Overrides the entity form controller service for layout builder decoration test.
+ */
+class LayoutBuilderDecorationTestHtmlEntityFormController extends FormController {
+
+ /**
+ * The entity form controller being decorated.
+ *
+ * @var \Drupal\Core\Controller\FormController
+ */
+ protected $entityFormController;
+
+ /**
+ * Constructs a LayoutBuilderDecorationTestHtmlEntityFormController object.
+ *
+ * @param \Drupal\Core\Controller\FormController $entity_form_controller
+ * The entity form controller being decorated.
+ */
+ public function __construct(FormController $entity_form_controller) {
+ $this->entityFormController = $entity_form_controller;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getContentResult(Request $request, RouteMatchInterface $route_match) {
+ return $this->entityFormController->getContentResult($request, $route_match);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFormArgument(RouteMatchInterface $route_match) {
+ return $this->entityFormController->getFormArgument($route_match);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFormObject(RouteMatchInterface $route_match, $form_arg) {
+ return $this->entityFormController->getFormObject($route_match, $form_arg);
+ }
+
+}
diff --git a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
index 65ae01bce55d66baea122cbab8f7c7dd2d2a1556..36519a786323af190c7710eb0a01d22ae3a14fb6 100644
--- a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
+++ b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
@@ -447,6 +447,23 @@ public function testLayoutBuilderUi() {
$this->assertSame($expected_labels, $labels);
}
+ /**
+ * Test decorating controller.entity_form while layout_builder is installed.
+ */
+ public function testHtmlEntityFormControllerDecoration() {
+ $assert_session = $this->assertSession();
+
+ $this->drupalLogin($this->drupalCreateUser([
+ 'configure any layout',
+ 'administer node display',
+ ]));
+
+ // Install module that decorates controller.entity_form.
+ \Drupal::service('module_installer')->install(['layout_builder_decoration_test']);
+ $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default');
+ $assert_session->pageTextContains('Manage Display');
+ }
+
/**
* Test that layout builder checks entity view access.
*/
diff --git a/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php b/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php
index ca2138ec9ee72a1ab1d59ae0b71421bfaba966da..e50fe65e3586f4f95fa4f980ddf6c2c92f6b6520 100644
--- a/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php
+++ b/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php
@@ -12,7 +12,7 @@
use Drupal\layout_builder\SectionComponent;
use Drupal\Tests\UnitTestCase;
use Prophecy\Argument;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
/**
* @coversDefaultClass \Drupal\layout_builder\SectionComponent
@@ -39,7 +39,7 @@ public function testToRenderArray() {
/** @var \Drupal\layout_builder\Event\SectionComponentBuildRenderArrayEvent $event */
$event = $args[0];
$event->setBuild(['#markup' => $event->getPlugin()->getPluginId()]);
- return;
+ return $event;
});
$layout_plugin = $this->prophesize(LayoutInterface::class);
diff --git a/core/modules/migrate/src/Plugin/MigrateProcessInterface.php b/core/modules/migrate/src/Plugin/MigrateProcessInterface.php
index 8fef305f74f05b85c02c32f4ed33d8396b015911..09ff01e48a24fb99465504987f6bfcee9e4dc331 100644
--- a/core/modules/migrate/src/Plugin/MigrateProcessInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateProcessInterface.php
@@ -9,16 +9,9 @@
/**
* An interface for migrate process plugins.
*
- * A process plugin will typically implement the transform() method to perform
- * its work. However, it is possible instead for a process plugin to use any
- * number of methods, thus offering different alternatives ways of processing.
- * In this case, the transform() method should not be implemented, and the
- * plugin configuration must provide the name of the method to be called via the
- * "method" key. Each method must have the same signature as transform().
- * The base class \Drupal\migrate\ProcessPluginBase takes care of implementing
- * transform() and calling the configured method. See
- * \Drupal\migrate\Plugin\migrate\process\SkipOnEmpty and
- * d6_field_instance_widget_settings.yml for examples.
+ * Migrate process plugins transform the input value.For example, transform a
+ * human provided name into a machine name, look up an identifier in a previous
+ * migration and so on.
*
* @see \Drupal\migrate\Plugin\MigratePluginManager
* @see \Drupal\migrate\ProcessPluginBase
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
index 780496e6109426bce2eb584a4713532c2af29ba8..bb4f6c0be8ba280a480bf9b4bdffca95aff9af14 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
@@ -126,7 +126,7 @@ public function createInstancesByTag($tag) {
$migrations = array_filter($this->getDefinitions(), function ($migration) use ($tag) {
return !empty($migration['migration_tags']) && in_array($tag, $migration['migration_tags']);
});
- return $this->createInstances(array_keys($migrations));
+ return $migrations ? $this->createInstances(array_keys($migrations)) : [];
}
/**
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
index 01e4385c2e366ed25a85d41e7d8ae44d31c3f822..c4cb1b5aa168ce692ac70aae6da5f42d089af916 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
@@ -47,7 +47,8 @@ public function createStubMigration(array $definition);
* A migration tag we want to filter by.
*
* @return array|\Drupal\migrate\Plugin\MigrationInterface[]
- * An array of migration objects with the given tag.
+ * An array of migration objects with the given tag, or an empty array if no
+ * migrations with that tag exist.
*/
public function createInstancesByTag($tag);
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index be0b5e3e624ac015b6ab050aa48a8d78cbdb1bb3..d96bfab70dcb7b6cdc3827e9f1836a0439d6d595 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -14,6 +14,10 @@
/**
* Provides a generic destination to import entities.
*
+ * Available configuration keys:
+ * - default_bundle: (optional) The bundle to use for this row if 'bundle' is
+ * not defined on the row.
+ *
* Examples:
*
* @code
@@ -44,8 +48,11 @@
* revision_timestamp: timestamp
* destination:
* plugin: entity:node
+ * default_bundle: custom
* @endcode
*
+ * This will save the processed, migrated row as a node of type 'custom'.
+ *
* @MigrateDestination(
* id = "entity",
* deriver = "Drupal\migrate\Plugin\Derivative\MigrateEntity"
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index 51ad19b0e31ddf84797be70d3387017f722f6e2f..65d6ae9ba1f982f21a45e3405731c948b5de0757 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -84,6 +84,7 @@
* validate: true
* @endcode
*
+ * @see \Drupal\migrate\Plugin\migrate\destination\Entity
* @see \Drupal\migrate\Plugin\migrate\destination\EntityRevision
*/
class EntityContentBase extends Entity implements HighestIdInterface, MigrateValidatableEntityInterface {
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 6675ec8947fba8e977188e3dfaa887e6363edf14..2692a633f05397ee5eecfefaee4c1aa12a8eb450 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -312,6 +312,8 @@ public function setMessage(MigrateMessageInterface $message) {
/**
* Create the map and message tables if they don't already exist.
+ *
+ * @throws \Drupal\Core\Database\DatabaseException
*/
protected function ensureTables() {
if (!$this->getDatabase()->schema()->tableExists($this->mapTableName)) {
@@ -373,13 +375,46 @@ protected function ensureTables() {
'not null' => FALSE,
'description' => 'Hash of source row data, for detecting changes',
];
- $schema = [
- 'description' => 'Mappings from source identifier value(s) to destination identifier value(s).',
- 'fields' => $fields,
- 'primary key' => [$this::SOURCE_IDS_HASH],
- 'indexes' => $indexes,
- ];
- $this->getDatabase()->schema()->createTable($this->mapTableName, $schema);
+
+ // To keep within the MySQL maximum key length of 3072 bytes we try
+ // different groupings of the source IDs. Groups are created in chunks
+ // starting at a chunk size equivalent to the number of the source IDs.
+ // On each loop the chunk size is reduced by one until either the map
+ // table is successfully created or the chunk_size is less than zero. If
+ // there are no source IDs the table is created.
+ $chunk_size = count($source_id_schema);
+ while ($chunk_size >= 0) {
+ $indexes = [];
+ if ($chunk_size > 0) {
+ foreach (array_chunk(array_keys($source_id_schema), $chunk_size) as $key => $index_columns) {
+ $index_name = ($key === 0) ? 'source' : "source$key";
+ $indexes[$index_name] = $index_columns;
+ }
+ }
+ $schema = [
+ 'description' => 'Mappings from source identifier value(s) to destination identifier value(s).',
+ 'fields' => $fields,
+ 'primary key' => [$this::SOURCE_IDS_HASH],
+ 'indexes' => $indexes,
+ ];
+
+ try {
+ $this->getDatabase()
+ ->schema()
+ ->createTable($this->mapTableName, $schema);
+ break;
+ }
+ catch (DatabaseException $e) {
+ $pdo_exception = $e->getPrevious();
+ $mysql_index_error = $pdo_exception instanceof \PDOException && $pdo_exception->getCode() === '42000' && $pdo_exception->errorInfo[1] === 1071;
+ $chunk_size--;
+ // Rethrow the exception if the source IDs can not be in smaller
+ // groups.
+ if (!$mysql_index_error || $chunk_size <= 0) {
+ throw $e;
+ }
+ }
+ }
// Now do the message table.
if (!$this->getDatabase()->schema()->tableExists($this->messageTableName())) {
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Flatten.php b/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
index 324f0b92c88812f2346c52bb5c7d20aa38b790bb..6a6dd56252bc9528702e9f97b4d3c74a85ad08c6 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
@@ -2,6 +2,7 @@
namespace Drupal\migrate\Plugin\migrate\process;
+use Drupal\migrate\MigrateException;
use Drupal\migrate\MigrateExecutableInterface;
use Drupal\migrate\ProcessPluginBase;
use Drupal\migrate\Row;
@@ -49,6 +50,10 @@ class Flatten extends ProcessPluginBase {
* For example, [[1, 2, [3, 4]]] becomes [1, 2, 3, 4].
*/
public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+ if (!is_array($value) && !is_object($value)) {
+ $type = gettype($value);
+ throw new MigrateException(sprintf("Input should be an array or an object, instead it was of type '%s'", $type));
+ }
return iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveArrayIterator($value)), FALSE);
}
diff --git a/core/modules/migrate/src/ProcessPluginBase.php b/core/modules/migrate/src/ProcessPluginBase.php
index b6a0f5aaf84f915202c1af5bf6e33426b2b3396c..2aea55660ee08100acefe374b8ccc84891825b49 100644
--- a/core/modules/migrate/src/ProcessPluginBase.php
+++ b/core/modules/migrate/src/ProcessPluginBase.php
@@ -12,10 +12,18 @@
* transform a human provided name into a machine name, look up an identifier
* in a previous migration and so on.
*
+ * Process plugins extending this class can use any number of methods, thus
+ * offering different alternative ways of processing. In this case, the
+ * transform() method should not be implemented, and the plugin configuration
+ * must provide the name of the method to be called via the "method" key. Each
+ * method must have the same signature as transform().
+ *
* @see https://www.drupal.org/node/2129651
* @see \Drupal\migrate\Plugin\MigratePluginManager
* @see \Drupal\migrate\Plugin\MigrateProcessInterface
* @see \Drupal\migrate\Annotation\MigrateProcessPlugin
+ * @see \Drupal\migrate\Plugin\migrate\process\SkipOnEmpty
+ * @see d7_field_formatter_settings.yml
* @see plugin_api
*
* @ingroup migration
diff --git a/core/modules/migrate/tests/modules/migrate_tag_test/migrate_tag_test.info.yml b/core/modules/migrate/tests/modules/migrate_tag_test/migrate_tag_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2f1827005d16fcf3cbd43407beb73d327aabe31f
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_tag_test/migrate_tag_test.info.yml
@@ -0,0 +1,7 @@
+name: Migration Tag Test
+type: module
+description: Provide migrations for testing 'migration_tags' property
+package: Testing
+version: VERSION
+dependencies:
+ - drupal:migrate
diff --git a/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_0.yml b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_0.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0c81732a6aa08cab51c42b56f0aefd4582fe89fd
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_0.yml
@@ -0,0 +1,16 @@
+id: tag_test_0
+label: migration tag test 0
+migration_tags:
+ - test
+ - tag_test_0
+source:
+ plugin: embedded_data
+ data_rows:
+ - id: 0
+ ids:
+ id:
+ type: integer
+process:
+ id: id
+destination:
+ plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_1.yml b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_1.yml
new file mode 100644
index 0000000000000000000000000000000000000000..242ebb78d99b274604249154ae37c44ab0e9892b
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_1.yml
@@ -0,0 +1,16 @@
+id: tag_test_1
+label: migration tag test 1
+migration_tags:
+ - test
+ - tag_test_1
+source:
+ plugin: embedded_data
+ data_rows:
+ - id: 0
+ ids:
+ id:
+ type: integer
+process:
+ id: id
+destination:
+ plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_no_tags.yml b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_no_tags.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6d2ed08ad330cf6ced7026275f39e78f0ca5ad91
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_tag_test/migrations/tag_test_no_tags.yml
@@ -0,0 +1,13 @@
+id: tag_test_no_tag
+label: migration tag test no tags
+source:
+ plugin: embedded_data
+ data_rows:
+ - id: 0
+ ids:
+ id:
+ type: integer
+process:
+ id: id
+destination:
+ plugin: null
diff --git a/core/modules/migrate/tests/src/Kernel/MigrationPluginManagerTest.php b/core/modules/migrate/tests/src/Kernel/MigrationPluginManagerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..45375d2cf4a3166b4f5d24575537a25a4577ea0c
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrationPluginManagerTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel;
+
+/**
+ * Tests the migration plugin manager.
+ *
+ * @group migrate
+ *
+ * @coversDefaultClass \Drupal\migrate\Plugin\MigrationPluginManager
+ */
+class MigrationPluginManagerTest extends MigrateTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['migrate', 'migrate_tag_test'];
+
+ /**
+ * The migration plugin manager
+ *
+ * @var \Drupal\migrate\Plugin\MigrationPluginManager
+ */
+ protected $migrationPluginManager;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp(): void {
+ parent::setUp();
+ $this->migrationPluginManager = \Drupal::service('plugin.manager.migration');
+ }
+
+ /**
+ * Tests Migration::createInstancesByTag().
+ *
+ * @covers ::createInstancesByTag
+ *
+ * @dataProvider providerCreateInstanceByTag
+ */
+ public function testCreateInstancesByTag($tags, $expected) {
+ // The test module includes a migration that does not use the migration_tags
+ // property. It is there to confirm that it is not included in the results.
+ // We create it to ensure it is a valid migration.
+ $migration = $this->migrationPluginManager->createInstances(['tag_test_no_tag']);
+ $this->assertArrayHasKey('tag_test_no_tag', $migration);
+ $migrations = $this->migrationPluginManager->createInstancesByTag($tags);
+ $actual = array_keys($migrations);
+ $this->assertSame($expected, $actual);
+ }
+
+ /**
+ * Data provider for testCreateInstancesByTag
+ */
+ public function providerCreateInstanceByTag() {
+ return [
+ 'get test' => [
+ 'test',
+ ['tag_test_0', 'tag_test_1'],
+ ],
+ 'get tag_test_1' => [
+ 'tag_test_1',
+ ['tag_test_1'],
+ ],
+ 'get no tags' => [
+ '',
+ [],
+ ],
+ ];
+
+ }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b93402c35c50bc3b3c7d5ca9629a8bf9dfd0987
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php
@@ -0,0 +1,205 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel\Plugin\id_map;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+use Drupal\Tests\migrate\Unit\TestSqlIdMap;
+use Drupal\migrate\MigrateException;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * Tests that the migrate map table is created.
+ *
+ * @group migrate
+ */
+class SqlTest extends MigrateTestBase {
+
+ /**
+ * Database connection.
+ *
+ * @var \Drupal\Core\Database\Connection
+ */
+ protected $database;
+
+ /**
+ * Prophesized event dispatcher.
+ *
+ * @var object|\Prophecy\Prophecy\ProphecySubjectInterface|\Symfony\Component\EventDispatcher\EventDispatcherInterface
+ */
+ protected $eventDispatcher;
+
+ /**
+ * Definition of a test migration.
+ *
+ * @var array
+ */
+ protected $migrationDefinition;
+
+ /**
+ * The migration plugin manager.
+ *
+ * @var \Drupal\migrate\Plugin\MigrationPluginManager
+ */
+ protected $migrationPluginManager;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp(): void {
+ parent::setUp();
+ $this->database = \Drupal::database();
+ $this->eventDispatcher = $this->prophesize(EventDispatcherInterface::class)
+ ->reveal();
+ $this->migrationPluginManager = \Drupal::service('plugin.manager.migration');
+
+ $this->migrationDefinition = [
+ 'id' => 'test',
+ 'source' => [
+ 'plugin' => 'embedded_data',
+ 'data_rows' => [
+ [
+ 'alpha' => '1',
+ 'bravo' => '2',
+ 'charlie' => '3',
+ 'delta' => '4',
+ 'echo' => '5',
+ ],
+ ],
+ 'ids' => [],
+ ],
+ 'process' => [],
+ 'destination' => [
+ 'plugin' => 'null',
+ ],
+ ];
+ }
+
+ /**
+ * Tests that ensureTables creates the migrate map table.
+ *
+ * @dataProvider providerTestEnsureTables
+ */
+ public function testEnsureTables($ids) {
+ $this->migrationDefinition['source']['ids'] = $ids;
+ $migration = $this->migrationPluginManager->createStubMigration($this->migrationDefinition);
+
+ $map = new TestSqlIdMap($this->database, [], 'test', [], $migration, $this->eventDispatcher);
+ $map->ensureTables();
+
+ // Checks that the map table was created.
+ $exists = $this->database->schema()->tableExists('migrate_map_test');
+ $this->assertTrue($exists);
+ }
+
+ /**
+ * Provides data for testEnsureTables.
+ */
+ public function providerTestEnsureTables() {
+ return [
+ 'no ids' => [
+ [],
+ ],
+ 'one id' => [
+ [
+ 'alpha' => [
+ 'type' => 'string',
+ ],
+ ],
+ ],
+ 'too many' => [
+ [
+ 'alpha' => [
+ 'type' => 'string',
+ ],
+ 'bravo' => [
+ 'type' => 'string',
+ ],
+ 'charlie' => [
+ 'type' => 'string',
+ ],
+ 'delta' => [
+ 'type' => 'string',
+ ],
+ 'echo ' => [
+ 'type' => 'string',
+ ],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Tests exception is thrown in ensureTables fails.
+ *
+ * @dataProvider providerTestFailEnsureTables
+ */
+ public function testFailEnsureTables($ids) {
+ // This just tests mysql, as other PDO integrations allow longer indexes.
+ if (Database::getConnection()->databaseType() !== 'mysql') {
+ $this->markTestSkipped("This test only runs for MySQL");
+ }
+
+ $this->migrationDefinition['source']['ids'] = $ids;
+ $migration = $this->container
+ ->get('plugin.manager.migration')
+ ->createStubMigration($this->migrationDefinition);
+
+ // Use local id map plugin to force an error.
+ $map = new SqlIdMapTest($this->database, [], 'test', [], $migration, $this->eventDispatcher);
+
+ $this->expectException(DatabaseExceptionWrapper::class);
+ $this->expectExceptionMessage("Syntax error or access violation: 1074 Column length too big for column 'sourceid1' (max = 16383); use BLOB or TEXT instead:");
+ $map->ensureTables();
+ }
+
+ /**
+ * Provides data for testFailEnsureTables.
+ */
+ public function providerTestFailEnsureTables() {
+ return [
+ 'one id' => [
+ [
+ 'alpha' => [
+ 'type' => 'string',
+ ],
+ ],
+ ],
+ ];
+ }
+
+}
+
+/**
+ * Defines a test SQL ID map for use in tests.
+ */
+class SqlIdMapTest extends TestSqlIdMap implements \Iterator {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFieldSchema(array $id_definition) {
+ if (!isset($id_definition['type'])) {
+ return [];
+ }
+ switch ($id_definition['type']) {
+ case 'integer':
+ return [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ];
+
+ case 'string':
+ return [
+ 'type' => 'varchar',
+ 'length' => 65536,
+ 'not null' => FALSE,
+ ];
+
+ default:
+ throw new MigrateException($id_definition['type'] . ' not supported');
+ }
+ }
+
+}
diff --git a/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php b/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
index 38e1b98c4e1ce8c9fad77379c32205ddacbb87af..54307f3a0cc36908d906ea2eb6cf6abef752af24 100644
--- a/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
+++ b/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
@@ -18,7 +18,7 @@ class RequirementsExceptionTest extends UnitTestCase {
*/
public function testGetRequirements() {
$exception = new RequirementsException('Missing requirements ', ['requirements' => $this->missingRequirements]);
- $this->assertArrayEquals(['requirements' => $this->missingRequirements], $exception->getRequirements());
+ $this->assertEquals(['requirements' => $this->missingRequirements], $exception->getRequirements());
}
/**
diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
index 4cb14415bb254692d02e6cae39c6105575f908f0..6425ff5392672c8fa04c0571aa8a585cd8cb7755 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -200,7 +200,7 @@ protected function retrievalAssertHelper($expected_value, $actual_value, $messag
if (empty($expected_value && $actual_value)) {
return;
}
- $this->assertArrayEquals($expected_value, $actual_value, $message);
+ $this->assertEquals($expected_value, $actual_value, $message);
}
else {
$this->assertSame((string) $expected_value, (string) $actual_value, $message);
diff --git a/core/modules/migrate/tests/src/Unit/MigrationTest.php b/core/modules/migrate/tests/src/Unit/MigrationTest.php
index 8aa87c73249d6e4464d1faf266c230d8d3cf705d..b4fb8a96de35388f9aa4d957254037db23859be2 100644
--- a/core/modules/migrate/tests/src/Unit/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrationTest.php
@@ -123,7 +123,7 @@ public function testGetMigrations() {
$requirements = ['test_a', 'test_b', 'test_c', 'test_d'];
$migration->setRequirements($requirements);
- $this->assertArrayEquals($requirements, $migration->getRequirements());
+ $this->assertEquals($requirements, $migration->getRequirements());
}
/**
diff --git a/core/modules/migrate/tests/src/Unit/RowTest.php b/core/modules/migrate/tests/src/Unit/RowTest.php
index 8392220c6a69e36074fe2834f12a5676ee1d145c..cc16e8a215d0032bb850df867bdf1881f6bd5edd 100644
--- a/core/modules/migrate/tests/src/Unit/RowTest.php
+++ b/core/modules/migrate/tests/src/Unit/RowTest.php
@@ -116,7 +116,7 @@ public function testRowWithInvalidData() {
'title' => 'node X',
];
$this->expectException(\Exception::class);
- $row = new Row($invalid_values, $this->testSourceIds);
+ new Row($invalid_values, $this->testSourceIds);
}
/**
@@ -366,7 +366,7 @@ public function getDataProvider() {
*/
public function testGetMultiple(array $keys, array $expected_values) {
$row = $this->createRowWithDestinationProperties($this->testGetSourceProperties, $this->testGetSourceIds, $this->testGetDestinationProperties);
- $this->assertArrayEquals(array_combine($keys, $expected_values), $row->getMultiple($keys));
+ $this->assertEquals(array_combine($keys, $expected_values), $row->getMultiple($keys));
}
/**
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index 1adc95522f19bd50bec1d469ba25e288a1bb55f2..ad9da5b6d1d813298104f2a7cb8d263bd7b3e5d4 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -81,4 +81,11 @@ protected function getFieldSchema(array $id_definition) {
}
}
+ /**
+ * {@inheritdoc}
+ */
+ public function ensureTables() {
+ parent::ensureTables();
+ }
+
}
diff --git a/core/modules/migrate/tests/src/Unit/process/FlattenTest.php b/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
index 899644f5aeb9999a508987c195b852647ef195cf..3106260832a911ff4a40e87e16a7a8485236eaf7 100644
--- a/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\migrate\Unit\process;
+use Drupal\migrate\MigrateException;
use Drupal\migrate\Plugin\migrate\process\Flatten;
/**
@@ -11,13 +12,90 @@
*/
class FlattenTest extends MigrateProcessTestCase {
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ $this->plugin = new Flatten([], 'flatten', []);
+ parent::setUp();
+ }
+
/**
* Test that various array flatten operations work properly.
+ *
+ * @dataProvider providerTestFlatten
+ */
+ public function testFlatten($value, $expected) {
+ $flattened = $this->plugin->transform($value, $this->migrateExecutable, $this->row, 'destination_property');
+ $this->assertSame($expected, $flattened);
+ }
+
+ /**
+ * Provides data for the testFlatten.
+ */
+ public function providerTestFlatten() {
+ $object = (object) [
+ 'a' => 'test',
+ 'b' => '1.2',
+ 'c' => 'NULL',
+ ];
+ return [
+ 'array' => [
+ [1, 2, [3, 4, [5]], [], [7, 8]],
+ [1, 2, 3, 4, 5, 7, 8],
+ ],
+ 'object' => [
+ $object,
+ ['test', '1.2', 'NULL'],
+ ],
+ ];
+ }
+
+ /**
+ * Tests that Flatten throws a MigrateException.
+ *
+ * @dataProvider providerTestFlattenInvalid
+ */
+ public function testFlattenInvalid($value) {
+ $this->expectException(MigrateException::class);
+ $type = gettype($value);
+ $this->expectExceptionMessage(sprintf("Input should be an array or an object, instead it was of type '%s'", $type));
+ $this->plugin->transform($value, $this->migrateExecutable, $this->row, 'destination_property');
+ }
+
+ /**
+ * Provides data for the testFlattenInvalid.
*/
- public function testFlatten() {
- $plugin = new Flatten([], 'flatten', []);
- $flattened = $plugin->transform([1, 2, [3, 4, [5]], [], [7, 8]], $this->migrateExecutable, $this->row, 'destination_property');
- $this->assertSame([1, 2, 3, 4, 5, 7, 8], $flattened);
+ public function providerTestFlattenInvalid() {
+ $xml_str = <<<XML
+<xml version='1.0'?>
+<authors>
+ <name>Ada Lovelace</name>
+</authors>
+XML;
+ return [
+ 'empty string' => [
+ '',
+ ],
+ 'string' => [
+ 'Kate Sheppard',
+ ],
+ 'integer' => [
+ 1,
+ ],
+ 'float' => [
+ 1.2,
+ ],
+ 'NULL' => [
+ NULL,
+ ],
+ 'boolean' => [
+ TRUE,
+ ],
+ 'xml' => [
+ $xml_str,
+ ],
+ ];
}
}
diff --git a/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php b/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php
index c7edcbecfb2352b770fc3c86bbcc1fa1c8a0a5ef..7501c4e430c34cd744da774ca9e037ffceed583b 100644
--- a/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php
@@ -166,7 +166,7 @@ public function testNotFoundSubProcess($process_configuration, $source_values =
// values ended up in the proper destinations, and that the value of the
// key (@id) is the same as the destination ID (42).
$new_value = $plugin->transform($current_value, $migrate_executable, $row, 'test');
- $this->assertArrayEquals([], $new_value);
+ $this->assertSame([], $new_value);
}
/**
diff --git a/core/modules/migrate_drupal/src/MigrationState.php b/core/modules/migrate_drupal/src/MigrationState.php
index 4175caa1d7399a6fe0d9055bfaf13eff693f98b8..b49ff32dcd5a914822f48ce46aaa83b9bd5d3378 100644
--- a/core/modules/migrate_drupal/src/MigrationState.php
+++ b/core/modules/migrate_drupal/src/MigrationState.php
@@ -254,7 +254,7 @@ public function getUpgradeStates($version, array $source_system_data, array $mig
protected function getMigrationStates() {
// Always instantiate a new YamlDiscovery object so that we always search on
// the up-to-date list of modules.
- $discovery = new YamlDiscovery('migrate_drupal', array_map(function (&$value) {
+ $discovery = new YamlDiscovery('migrate_drupal', array_map(function ($value) {
return $value . '/migrations/state';
}, $this->moduleHandler->getModuleDirectories()));
return $discovery->findAll();
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
index 1ac4a1b9e58943abbbea190a8fccca8342a38f34..320fc236376b8295929984ced11013e1c7575712 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
@@ -9,8 +9,61 @@
/**
* Drupal variable source from database.
*
- * This source class always returns a single row and as such is not a good
- * example for any normal source class returning multiple rows.
+ * This source class fetches variables from the source Drupal database.
+ * Depending on the configuration, this returns zero or a single row and as such
+ * is not a good example for any normal source class returning multiple rows.
+ *
+ * The configuration may contain optional and required variable names. If any of
+ * the required variables is missing in the source, then the source will return
+ * zero rows.
+ *
+ * With this configuration, the source will return one row even when the
+ * "filter_fallback_format" variable isn't available:
+ * @code
+ * source:
+ * plugin: variable
+ * variables:
+ * - filter_fallback_format
+ * @endcode
+ *
+ * With this configuration, the source will return one row if the variable is
+ * available, and zero if it isn't:
+ * @code
+ * source:
+ * plugin: variable
+ * variables_required:
+ * - filter_fallback_format
+ * @endcode
+ *
+ * The optional and the required variable names are always merged together. All
+ * of the following configurations are valid:
+ * @code
+ * source:
+ * plugin: variable
+ * variables:
+ * - book_child_type
+ * - book_block_mode
+ * - book_allowed_types
+ * variables_required:
+ * - book_child_type
+ * - book_block_mode
+ * - book_allowed_types
+ *
+ * source:
+ * plugin: variable
+ * variables:
+ * - book_child_type
+ * - book_block_mode
+ * variables_required:
+ * - book_allowed_types
+ *
+ * source:
+ * plugin: variable
+ * variables_required:
+ * - book_child_type
+ * - book_block_mode
+ * - book_allowed_types
+ * @endcode
*
* @MigrateSource(
* id = "variable",
@@ -26,19 +79,40 @@ class Variable extends DrupalSqlBase {
*/
protected $variables;
+ /**
+ * The optional variables.
+ *
+ * @var array
+ */
+ protected $optionalVariables;
+
+ /**
+ * The required variables.
+ *
+ * @var array
+ */
+ protected $requiredVariables;
+
/**
* {@inheritdoc}
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_type_manager) {
parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_type_manager);
- $this->variables = $this->configuration['variables'];
+ $this->requiredVariables = $this->configuration['variables_required'] ?? [];
+ $variables = $this->configuration['variables'] ?? [];
+ $this->variables = array_unique(array_merge(array_values($variables), array_values($this->requiredVariables)));
+ $this->optionalVariables = array_diff($this->variables, $this->requiredVariables);
}
/**
* {@inheritdoc}
*/
protected function initializeIterator() {
- return new \ArrayIterator([$this->values()]);
+ if ($this->count()) {
+ return new \ArrayIterator([$this->values()]);
+ }
+
+ return new \ArrayIterator();
}
/**
@@ -60,7 +134,14 @@ protected function values() {
* {@inheritdoc}
*/
public function count($refresh = FALSE) {
- // Variable always returns a single row with at minimum an 'id' property.
+ if (empty($this->requiredVariables)) {
+ return 1;
+ }
+ $variable_names = array_keys($this->query()->execute()->fetchAllAssoc('name'));
+
+ if (!empty(array_diff($this->requiredVariables, $variable_names))) {
+ return 0;
+ }
return 1;
}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/VariableTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/VariableTest.php
index 66e9a5d5bd75e08ca8efc584a896b7edfeaa5a9d..3e3623eaa8283e8c8187b5772cf0525549005827 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/VariableTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/VariableTest.php
@@ -40,7 +40,7 @@ public function providerSource() {
];
// The expected count.
- $tests[0]['expected_count'] = NULL;
+ $tests[0]['expected_count'] = 1;
// The source plugin configuration.
$tests[0]['configuration']['variables'] = [
@@ -61,14 +61,15 @@ public function providerSource() {
],
];
- $tests[1]['expected_count'] = NULL;
+ $tests[1]['expected_count'] = 1;
$tests[1]['configuration']['variables'] = [
'foo',
'bar0',
];
- // Tests requesting mis-spelled variable names.
+ // Tests requesting mis-spelled variable names. If none of the required
+ // variables are available, this plugin still returns a single row.
$tests[2]['source_data']['variable'] = [
['name' => 'foo', 'value' => 'i:1;'],
['name' => 'bar', 'value' => 'b:0;'],
@@ -78,13 +79,130 @@ public function providerSource() {
'id' => 'foo0',
],
];
- $tests[2]['expected_count'] = NULL;
+ $tests[2]['expected_count'] = 1;
$tests[2]['configuration']['variables'] = [
'foo0',
'bar0',
];
- return $tests;
+ $source_data = [
+ 'variable' => [
+ ['name' => 'foo', 'value' => 'i:1;'],
+ ['name' => 'bar', 'value' => 'b:0;'],
+ ['name' => 'baz', 'value' => 's:6:"foobar";'],
+ ],
+ ];
+
+ // Test cases with only 'variables_required' configuration.
+ $variables_required_tests = [
+ 'Two required variables, all of them are available' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [
+ [
+ 'id' => 'foo',
+ 'foo' => 1,
+ 'bar' => FALSE,
+ ],
+ ],
+ 'expected_count' => 1,
+ 'configuration' => [
+ 'variables_required' => [
+ 'foo',
+ 'bar',
+ ],
+ ],
+ ],
+ 'Two required variables, only one is available' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [],
+ 'expected_count' => 0,
+ 'configuration' => [
+ 'variables_required' => [
+ 'foo',
+ 'bar0',
+ ],
+ ],
+ ],
+ 'One required and available variable' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [
+ [
+ 'id' => 'baz',
+ 'baz' => 'foobar',
+ ],
+ ],
+ 'expected_count' => 1,
+ 'configuration' => [
+ 'variables_required' => [
+ 'baz',
+ ],
+ ],
+ ],
+ 'One required, but missing variable' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [],
+ 'expected_count' => 0,
+ 'configuration' => [
+ 'variables_required' => [
+ 'bar0',
+ ],
+ ],
+ ],
+ // Test cases with both 'variables' and 'variables_required'
+ // configuration.
+ 'One optional and two required variables, all of them are available' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [
+ [
+ 'id' => 'foo',
+ 'foo' => 1,
+ 'bar' => FALSE,
+ 'baz' => 'foobar',
+ ],
+ ],
+ 'expected_count' => 1,
+ 'configuration' => [
+ 'variables' => ['foo'],
+ 'variables_required' => ['bar', 'baz'],
+ ],
+ ],
+ 'One optional and two required variables, only one required is available' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [],
+ 'expected_count' => 0,
+ 'configuration' => [
+ 'variables' => ['foo'],
+ 'variables_required' => ['bar', 'foobar'],
+ ],
+ ],
+ 'Two optional and one required and available variable, every optional is missing' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [
+ [
+ 'id' => 'qux',
+ 'bar' => FALSE,
+ ],
+ ],
+ 'expected_count' => 1,
+ 'configuration' => [
+ 'variables' => ['qux', 'waldo'],
+ 'variables_required' => ['bar'],
+ ],
+ ],
+ 'Two available optional and a required, but missing variable' => [
+ 'source_data' => $source_data,
+ 'expected_data' => [],
+ 'expected_count' => 0,
+ 'configuration' => [
+ 'variables' => ['baz', 'foo'],
+ 'variables_required' => [
+ 'foo_bar_baz',
+ ],
+ ],
+ ],
+ ];
+
+ return $tests + $variables_required_tests;
}
}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/StateFileExists.php b/core/modules/migrate_drupal/tests/src/Kernel/StateFileExists.php
index 73db3166f1e00be74544c4b53ec28c0190f087d0..f2fb8607e8f16d8f45107b6944ead95ff113f572 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/StateFileExists.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/StateFileExists.php
@@ -92,7 +92,7 @@ public function testMigrationState() {
$this->enableModules($modules_to_enable);
// Modules with a migrate_drupal.yml file.
- $has_state_file = (new YamlDiscovery('migrate_drupal', array_map(function (&$value) {
+ $has_state_file = (new YamlDiscovery('migrate_drupal', array_map(function ($value) {
return $value . '/migrations/state';
}, $module_handler->getModuleDirectories())))->findAll();
diff --git a/core/modules/migrate_drupal/tests/src/Traits/ValidateMigrationStateTestTrait.php b/core/modules/migrate_drupal/tests/src/Traits/ValidateMigrationStateTestTrait.php
index d113f3041466ed8438e38d5db641300e18cea847..8f8ef0cc646d09338bd1cb5231a6eb7084858f91 100644
--- a/core/modules/migrate_drupal/tests/src/Traits/ValidateMigrationStateTestTrait.php
+++ b/core/modules/migrate_drupal/tests/src/Traits/ValidateMigrationStateTestTrait.php
@@ -86,7 +86,7 @@ public function testMigrationState() {
// destination is not used yet but can be later for validating the
// source/destination pairs with the actual source/destination pairs in the
// migrate plugins.
- $system_info = (new YamlDiscovery('migrate_drupal', array_map(function (&$value) {
+ $system_info = (new YamlDiscovery('migrate_drupal', array_map(function ($value) {
return $value . '/migrations/state/';
}, \Drupal::moduleHandler()->getModuleDirectories())))->findAll();
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
index a36ba5f54fab6ae3cd928dc4c439c04a6a56c4e3..01eb3e91f92c4ab883235ba51ab9a7718e1d934b 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -51,12 +51,6 @@ public function testMigrateUpgradeExecute() {
$session->pageTextContains('Resolve all issues below to continue the upgrade.');
$this->drupalPostForm(NULL, $edits, t('Review upgrade'));
- // Ensure we get errors about missing modules.
- $session->pageTextContains(t('Resolve all issues below to continue the upgrade.'));
- $session->pageTextContains(t('The no_source_module plugin must define the source_module property.'));
-
- // Uninstall the module causing the missing module error messages.
- $this->container->get('module_installer')->uninstall(['migration_provider_test'], TRUE);
// Test the file sources.
$this->drupalGet('/upgrade');
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac6b491eb82ccc16455cf8e01166893082f1eae2
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/SourceProviderTest.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal_ui\Functional;
+
+/**
+ * Tests that a missing source provider error message is displayed.
+ *
+ * @group migrate_drupal_ui
+ */
+class SourceProviderTest extends MigrateUpgradeTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'migrate_drupal_ui',
+ // Will generate an error for a missing source module.
+ 'migration_provider_test',
+ ];
+
+ /**
+ * Test missing source provider.
+ *
+ * @dataProvider providerSourceProvider
+ */
+ public function testSourceProvider($path_to_database) {
+ $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . $path_to_database);
+
+ $session = $this->assertSession();
+ $connection_options = $this->sourceDatabase->getConnectionOptions();
+ $driver = $connection_options['driver'];
+ $connection_options['prefix'] = $connection_options['prefix']['default'];
+ // Use the driver connection form to get the correct options out of the
+ // database settings. This supports all of the databases we test against.
+ $drivers = drupal_get_database_types();
+ $form = $drivers[$driver]->getFormOptions($connection_options);
+ $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
+ $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
+ $edit = [
+ $driver => $connection_options,
+ 'source_private_file_path' => $this->getSourceBasePath(),
+ 'version' => $version,
+ ];
+ if ($version == 6) {
+ $edit['d6_source_base_path'] = $this->getSourceBasePath();
+ }
+ else {
+ $edit['source_base_path'] = $this->getSourceBasePath();
+ }
+ if (count($drivers) !== 1) {
+ $edit['driver'] = $driver;
+ }
+ $edits = $this->translatePostValues($edit);
+
+ // Start the upgrade.
+ $this->drupalGet('/upgrade');
+ [$new_site_version] = explode('.', \Drupal::VERSION, 2);
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $new_site_version.");
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+ $session->fieldExists('mysql[host]');
+ $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+
+ // Ensure we get errors about missing modules.
+ $session->pageTextContains(t('Resolve all issues below to continue the upgrade.'));
+ $session->pageTextContains(t('The no_source_module plugin must define the source_module property.'));
+
+ // Uninstall the module causing the missing module error messages.
+ $this->container->get('module_installer')
+ ->uninstall(['migration_provider_test'], TRUE);
+
+ // Restart the upgrade process and test there is no source_module error.
+ $this->drupalGet('/upgrade');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $new_site_version.");
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+ $session->fieldExists('mysql[host]');
+ $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+
+ // Ensure there are no errors about missing modules from the test module.
+ $session->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.'));
+ $session->pageTextNotContains(t('Source module not found for migration_provider_test.'));
+ // Ensure there are no errors about any other missing migration providers.
+ $session->pageTextNotContains(t('module not found'));
+ }
+
+ /**
+ * Data provider for testSourceProvider.
+ */
+ public function providerSourceProvider() {
+ return [
+ [
+ 'path_to_database' => '/tests/fixtures/drupal6.php',
+ ],
+ [
+ 'path_to_database' => '/tests/fixtures/drupal7.php',
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getSourceBasePath() {
+ return '';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getAvailablePaths() {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityCounts() {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityCountsIncremental() {
+ return [];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getMissingPaths() {
+ return [];
+ }
+
+}
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index 42d7c514414ad418a9e3bc096cefdccc345e4123..393540712053ec732379891b54b1f45ee2cd450c 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -29,7 +29,6 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
'book',
'forum',
'statistics',
- 'migration_provider_test',
];
/**
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index 4c9353c4c4f2bd04e36033bd4d962ae6c3ba3f24..b8010c6614b150cccd2e2477aec72ab6cb112164 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -31,7 +31,6 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
'forum',
'rdf',
'statistics',
- 'migration_provider_test',
];
/**
diff --git a/core/modules/path_alias/tests/src/Kernel/AliasTest.php b/core/modules/path_alias/tests/src/Kernel/AliasTest.php
index 02069217371acc345f3390a70b87c50c42399550..946c2ec38d93270041e5020af212136b13e9835c 100644
--- a/core/modules/path_alias/tests/src/Kernel/AliasTest.php
+++ b/core/modules/path_alias/tests/src/Kernel/AliasTest.php
@@ -179,7 +179,6 @@ public function testWhitelistCacheDeletionMidRequest() {
// Create AliasManager and Path object.
$whitelist = new AliasWhitelist('path_alias_whitelist', $memoryCounterBackend, $this->container->get('lock'), $this->container->get('state'), $this->container->get('path_alias.repository'));
- $aliasManager = new AliasManager($this->container->get('path_alias.repository'), $whitelist, $this->container->get('language_manager'), $memoryCounterBackend);
// Whitelist cache should not exist at all yet.
$this->assertFalse($memoryCounterBackend->get('path_alias_whitelist'));
diff --git a/core/modules/quickedit/js/models/EntityModel.es6.js b/core/modules/quickedit/js/models/EntityModel.es6.js
index 2984425318b8370b7b98dbb5bde0bfed31eea9bd..c13d158fbb8cc52f67a4c540ac1785ecbfd8a5f7 100644
--- a/core/modules/quickedit/js/models/EntityModel.es6.js
+++ b/core/modules/quickedit/js/models/EntityModel.es6.js
@@ -526,8 +526,8 @@
options.success.call(entityModel);
}
};
- // Trigger the AJAX request, which will will return the
- // quickeditEntitySaved AJAX command to which we then react.
+ // Trigger the AJAX request, which will return the quickeditEntitySaved
+ // AJAX command to which we then react.
entitySaverAjax.execute();
},
diff --git a/core/modules/rest/tests/src/Unit/Entity/RestResourceConfigTest.php b/core/modules/rest/tests/src/Unit/Entity/RestResourceConfigTest.php
index f60225e5eae2e88b17851c14381af1d7f99795ff..bf9a989c5fbc2a9e15e6975f7123298c97aa0a00 100644
--- a/core/modules/rest/tests/src/Unit/Entity/RestResourceConfigTest.php
+++ b/core/modules/rest/tests/src/Unit/Entity/RestResourceConfigTest.php
@@ -36,7 +36,7 @@ public function testNormalizeRestMethod() {
'configuration' => $configuration,
], 'rest_resource_config');
- $this->assertArrayEquals($expected, $entity->getMethods());
+ $this->assertEquals($expected, $entity->getMethods());
}
}
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.libraries.yml b/core/modules/system/tests/modules/theme_test/theme_test.libraries.yml
index 9ff26ee5307f4593ac640df272d5c36ef3b8f975..95626b155ca9b53ef9cd49481a0e143498f75e3d 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.libraries.yml
+++ b/core/modules/system/tests/modules/theme_test/theme_test.libraries.yml
@@ -5,3 +5,17 @@ theme_stylesheets_override_and_remove_test:
css/base-remove.css: {}
css/sub-override.css: {}
css/sub-remove.css: {}
+
+deprecated_library:
+ version: VERSION
+ css:
+ base:
+ css/foo.css: {}
+ deprecated: 'The "%library_id%" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com'
+
+another_deprecated_library:
+ version: VERSION
+ css:
+ base:
+ css/bar.css: {}
+ deprecated: 'The "%library_id%" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com'
diff --git a/core/modules/system/tests/src/Functional/File/ConfigTest.php b/core/modules/system/tests/src/Functional/File/ConfigTest.php
index 56115dc4c8cc784d707ad6c2174cc68c21372277..2c47c4d7a2d0f3b887ec77fbcc52c5dea0565571 100644
--- a/core/modules/system/tests/src/Functional/File/ConfigTest.php
+++ b/core/modules/system/tests/src/Functional/File/ConfigTest.php
@@ -32,7 +32,6 @@ public function testFileConfigurationPage() {
// Set the file paths to non-default values.
// The respective directories are created automatically
// upon form submission.
- $file_path = $this->publicFilesDirectory;
$fields = [
'file_default_scheme' => 'private',
];
diff --git a/core/modules/system/tests/src/Functional/Form/CheckboxTest.php b/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
index f67c31185a4a04fe608ba006dbcf842eeb2f2535..6e6fbb631837de5296197554f446bed4e54b1930 100644
--- a/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
+++ b/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
@@ -71,7 +71,7 @@ public function testFormCheckbox() {
// the checkbox.
$this->drupalGet('form-test/checkboxes-zero/1');
$this->assertSession()->fieldExists('checkbox_off[0]')->check();
- $this->drupalPostForm(NULL, NULL, 'Save');
+ $this->drupalPostForm(NULL, [], 'Save');
$results = json_decode($this->getSession()->getPage()->getContent());
$this->assertIdentical($results->checkbox_off, ['0', 0, 0], 'The first choice is on in checkbox_off but the rest is not');
@@ -91,7 +91,7 @@ public function testFormCheckbox() {
// the checkbox.
$this->drupalGet('form-test/checkboxes-zero/0');
$this->assertSession()->fieldExists('checkbox_off[0]')->check();
- $this->drupalPostForm(NULL, NULL, 'Save');
+ $this->drupalPostForm(NULL, [], 'Save');
$checkboxes = $this->xpath('//input[@type="checkbox"]');
$this->assertCount(9, $checkboxes, 'Correct number of checkboxes found.');
diff --git a/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php b/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
index 8367fd28c0aae7843e96cd4edaa198060369db63..f031187c1b6e862a1c2f8ae8d307dc85d3125b62 100644
--- a/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
@@ -38,12 +38,12 @@ public function testConfirmForm() {
$this->assertSession()->addressEquals('form-test/autocomplete');
// Test submitting the form.
- $this->drupalPostForm('form-test/confirm-form', NULL, t('ConfirmFormTestForm::getConfirmText().'));
+ $this->drupalPostForm('form-test/confirm-form', [], t('ConfirmFormTestForm::getConfirmText().'));
$this->assertText('The ConfirmFormTestForm::submitForm() method was used for this form.');
$this->assertSession()->addressEquals('');
// Test submitting the form with a destination.
- $this->drupalPostForm('form-test/confirm-form', NULL, t('ConfirmFormTestForm::getConfirmText().'), ['query' => ['destination' => 'admin/config']]);
+ $this->drupalPostForm('form-test/confirm-form', [], t('ConfirmFormTestForm::getConfirmText().'), ['query' => ['destination' => 'admin/config']]);
$this->assertSession()->addressEquals('admin/config');
// Test cancelling the form with a complex destination.
diff --git a/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php b/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
index 193ff9e1b82440b48063258e4a0737029a093dc0..0203598437d0e88a2772166daafe411046fe7138 100644
--- a/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
@@ -27,7 +27,7 @@ class ElementsAccessTest extends BrowserTestBase {
* Ensures that child values are still processed when #access = FALSE.
*/
public function testAccessFalse() {
- $this->drupalPostForm('form_test/vertical-tabs-access', NULL, t('Submit'));
+ $this->drupalPostForm('form_test/vertical-tabs-access', [], t('Submit'));
$this->assertNoText('This checkbox inside a vertical tab does not have its default value.');
$this->assertNoText('This textfield inside a vertical tab does not have its default value.');
$this->assertNoText('This checkbox inside a fieldset does not have its default value.');
diff --git a/core/modules/system/tests/src/Functional/Form/FormObjectTest.php b/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
index 50ffdaddd7a1878fb5b1aec98c21eea45d0fd253..2e5d27a68b41b6f6ac9a98389885fc46f27b4cec 100644
--- a/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
+++ b/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
@@ -45,7 +45,7 @@ public function testObjectFormCallback() {
$this->assertText('The FormTestArgumentsObject::buildForm() method was used for this form.');
$elements = $this->xpath('//form[@id="form-test-form-test-arguments-object"]');
$this->assertTrue(!empty($elements), 'The correct form ID was used.');
- $this->drupalPostForm(NULL, NULL, t('Save'));
+ $this->drupalPostForm(NULL, [], t('Save'));
$this->assertText('The FormTestArgumentsObject::validateForm() method was used for this form.');
$this->assertText('The FormTestArgumentsObject::submitForm() method was used for this form.');
$value = $config_factory->get('form_test.object')->get('bananas');
diff --git a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
index a32a3f939cf9f7e39adbf42780b889e45fd2999e..a9766f5492219020d52045d09bdcdf974012ad57 100644
--- a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
@@ -167,7 +167,7 @@ public function testInstalledIncompatibleModule() {
// displayed for modules that are not installed.
$edit = ['uninstall[changing_module]' => 'changing_module'];
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText('The selected modules have been uninstalled.');
foreach ($incompatible_updates as $incompatible_update) {
$incompatible_info = $info + $incompatible_update;
diff --git a/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
index 75f5cfc2aaf2f1a6c5a044a16d47f2904fea680e..9439445487f21471e27cb28a40d8caf66bcf3d2a 100644
--- a/core/modules/system/tests/src/Functional/Module/DependencyTest.php
+++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -47,7 +47,7 @@ public function testEnableWithoutDependency() {
// Assert that the language tables weren't enabled.
$this->assertTableCount('language', FALSE);
- $this->drupalPostForm(NULL, NULL, t('Continue'));
+ $this->drupalPostForm(NULL, [], t('Continue'));
$this->assertText(t('2 modules have been enabled: Content Translation, Language.'), 'Modules status has been updated.');
$this->assertModules(['content_translation', 'language'], TRUE);
@@ -217,13 +217,13 @@ public function testUninstallDependents() {
// uninstalled.
$edit = ['uninstall[forum]' => 'forum'];
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
// Uninstall comment module.
$edit = ['uninstall[comment]' => 'comment'];
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
}
diff --git a/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php b/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
index 6287fc590671c2fd07e9208d525c51fe45509f99..035c133d3abff1a5b7375606db44ced9d100a204 100644
--- a/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
@@ -264,7 +264,7 @@ protected function assertSuccessfulUninstall($module, $package = 'Core') {
$edit = [];
$edit['uninstall[' . $module . ']'] = TRUE;
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$this->assertModules([$module], FALSE);
diff --git a/core/modules/system/tests/src/Functional/Module/UninstallTest.php b/core/modules/system/tests/src/Functional/Module/UninstallTest.php
index 003ec4684f1327f5151c6ad637b6d03797f6f9e7..32ea0c28718f76bff07d2d900b2f69b83ef16161 100644
--- a/core/modules/system/tests/src/Functional/Module/UninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/UninstallTest.php
@@ -89,7 +89,7 @@ public function testUninstallPage() {
$this->assertNoText(\Drupal::translation()->translate('Configuration deletions'), 'No configuration deletions listed on the module install confirmation page.');
$this->assertText(\Drupal::translation()->translate('Configuration updates'), 'Configuration updates listed on the module install confirmation page.');
$this->assertText($node_type->label());
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
// Uninstall node testing that the configuration that will be deleted is
@@ -121,7 +121,7 @@ public function testUninstallPage() {
$cached = \Drupal::cache()->get('uninstall_test');
$this->assertEqual($cached->data, 'test_uninstall_page', new FormattableMarkup('Cache entry found: @bin', ['@bin' => $cached->data]));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
// Check that the page does not have double escaped HTML tags.
$this->assertNoRaw('<label');
@@ -167,7 +167,7 @@ public function testFailedInstallStatus() {
$this->assertText('Module installer config test');
$edit['uninstall[module_installer_config_test]'] = TRUE;
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'));
$this->assertNoText('Module installer config test');
}
diff --git a/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/core/modules/system/tests/src/Functional/System/DateTimeTest.php
index 3f1bb71fc4852ff312a8d40b4a4c6736681e5b46..75dfd5345390e42ccef71ad20c0acfd5177b3ef5 100644
--- a/core/modules/system/tests/src/Functional/System/DateTimeTest.php
+++ b/core/modules/system/tests/src/Functional/System/DateTimeTest.php
@@ -113,7 +113,7 @@ public function testDateFormatConfiguration() {
// Edit the custom date format and re-save without editing the format.
$this->drupalGet('admin/config/regional/date-time');
$this->clickLink(t('Edit'));
- $this->drupalPostForm(NULL, NULL, t('Save format'));
+ $this->drupalPostForm(NULL, [], t('Save format'));
// Verify that the user is redirected to the correct page.
$this->assertSession()->addressEquals(Url::fromRoute('entity.date_format.collection'));
$this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.');
diff --git a/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php b/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
index 3a4ce3bb42feadf7ed7112f352b89d795f165db9..949c094eb7c9ac136ef837e3fe0237e95954f51a 100644
--- a/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
+++ b/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
@@ -49,7 +49,7 @@ public function testMainContentFallback() {
// Uninstall the block module.
$edit['uninstall[block]'] = 'block';
$this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
- $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+ $this->drupalPostForm(NULL, [], t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$this->rebuildContainer();
$this->assertFalse(\Drupal::moduleHandler()->moduleExists('block'), 'Block module uninstall.');
diff --git a/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
index e168af31c75b3c70e3e1a7a19885908cf6bb9cde..6760629ce6139d4e1dd640b4193ec0dd6efe8c84 100644
--- a/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
+++ b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
@@ -4,3 +4,13 @@ description: 'Test theme to test deprecated functionality.'
version: VERSION
package: Testing
base theme: test_theme
+
+libraries-override:
+ theme_test/deprecated_library:
+ css:
+ base:
+ css/foo.css: css/bar.css
+
+libraries-extend:
+ theme_test/another_deprecated_library:
+ - test_legacy_theme/library
diff --git a/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.libraries.yml b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.libraries.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a7ab327b4a5a731059436bc830561958f112e3f7
--- /dev/null
+++ b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.libraries.yml
@@ -0,0 +1,4 @@
+library:
+ css:
+ base:
+ css/baz.css: {}
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTest.php b/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 5c97ab6a8401f36625266a8f56970dce4df7b2fe..578779f29d004c8c662821a1e5cf1fb944ec6f21 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -222,7 +222,7 @@ public function testTaxonomyNode() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
// Ensure that term is displayed when previewing the node.
$this->assertSession()->pageTextContainsOnce($term2->getName());
- $this->drupalPostForm('node/' . $node->id() . '/edit', NULL, t('Preview'));
+ $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Preview'));
// Ensure that term is displayed when previewing the node again.
$this->assertSession()->pageTextContainsOnce($term2->getName());
}
@@ -304,7 +304,7 @@ public function testNodeTermCreationAndDeletion() {
// Delete term 1 from the term edit page.
$this->drupalGet('taxonomy/term/' . $term_objects['term1']->id() . '/edit');
$this->clickLink(t('Delete'));
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
// Delete term 2 from the term delete page.
$this->drupalGet('taxonomy/term/' . $term_objects['term2']->id() . '/delete');
@@ -390,7 +390,7 @@ public function testTermInterface() {
// Delete the term.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
$this->clickLink(t('Delete'));
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
// Assert that the term no longer exists.
$this->drupalGet('taxonomy/term/' . $term->id());
diff --git a/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
index d359ed0b7a03842e2b2af80caf822a6374eb8e71..b766418209e42e403f833edd17e2ee1d722c77d3 100644
--- a/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
@@ -267,7 +267,7 @@ public function testVocabularyPermissionsTaxonomyTerm() {
$this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', ['@entity-type' => 'taxonomy term', '%label' => $edit['name[0][value]']]));
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
$this->assertRaw(t('Deleted term %name.', ['%name' => $edit['name[0][value]']]));
// Test as user with "create" permissions.
@@ -346,7 +346,7 @@ public function testVocabularyPermissionsTaxonomyTerm() {
$this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', ['@entity-type' => 'taxonomy term', '%label' => $term->getName()]));
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
$this->assertRaw(t('Deleted term %name.', ['%name' => $term->getName()]));
// Test as user without proper permissions.
diff --git a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
index f7a58b02f30855fb845c449b39743fb09f31835a..b93172e8d05b60c9f381447f0cc8e9551f206ebd 100644
--- a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
@@ -154,7 +154,7 @@ public function testTaxonomyAdminDeletingVocabulary() {
$this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), '[confirm deletion] Inform that all terms will be deleted.');
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Delete'));
+ $this->drupalPostForm(NULL, [], t('Delete'));
$this->assertRaw(t('Deleted vocabulary %name.', ['%name' => $vocabulary->label()]));
$this->container->get('entity_type.manager')->getStorage('taxonomy_vocabulary')->resetCache();
$this->assertNull(Vocabulary::load($vid), 'Vocabulary not found.');
diff --git a/core/modules/user/tests/src/Functional/UserCancelTest.php b/core/modules/user/tests/src/Functional/UserCancelTest.php
index f1d7c411e896ffc98cc37c247d4e1e9ffdb7cfa4..da42078599de219a7764d2e869b6be63bde8f465 100644
--- a/core/modules/user/tests/src/Functional/UserCancelTest.php
+++ b/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -138,11 +138,11 @@ public function testUserCancelInvalid() {
$node = $this->drupalCreateNode(['uid' => $account->id()]);
// Attempt to cancel account.
- $this->drupalPostForm('user/' . $account->id() . '/edit', NULL, t('Cancel account'));
+ $this->drupalPostForm('user/' . $account->id() . '/edit', [], t('Cancel account'));
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Attempt bogus account cancellation request confirmation.
@@ -184,7 +184,7 @@ public function testUserBlock() {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your username.'), 'Informs that all content will be remain as is.');
$this->assertNoText('Select the method to cancel the account above.', 'Does not allow user to select account cancellation method.');
@@ -192,7 +192,7 @@ public function testUserBlock() {
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
@@ -244,13 +244,13 @@ public function testUserBlockUnpublish() {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'), 'Informs that all content will be unpublished.');
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
@@ -324,13 +324,13 @@ public function testUserAnonymize() {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', ['%anonymous-name' => $this->config('user.settings')->get('anonymous')]));
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
@@ -384,13 +384,13 @@ public function testUserAnonymizeBatch() {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', ['%anonymous-name' => $this->config('user.settings')->get('anonymous')]));
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
@@ -455,13 +455,13 @@ public function testUserDelete() {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'), 'Informs that all content will be deleted.');
// Confirm account cancellation.
$timestamp = time();
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
@@ -497,12 +497,12 @@ public function testUserCancelByAdmin() {
// Delete regular user.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertRaw(t('Are you sure you want to cancel the account %name?', ['%name' => $account->getAccountName()]));
$this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertRaw(t('%name has been deleted.', ['%name' => $account->getAccountName()]));
$this->assertNull(User::load($account->id()), 'User is not found in the database.');
}
@@ -525,12 +525,12 @@ public function testUserWithoutEmailCancelByAdmin() {
// Delete regular user without email address.
$this->drupalGet('user/' . $account->id() . '/edit');
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertRaw(t('Are you sure you want to cancel the account %name?', ['%name' => $account->getAccountName()]));
$this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertRaw(t('%name has been deleted.', ['%name' => $account->getAccountName()]));
$this->assertNull(User::load($account->id()), 'User is not found in the database.');
}
@@ -569,7 +569,7 @@ public function testMassUserCancelByAdmin() {
$this->assertText(t('Notify user when account is canceled'), 'Allows to send notification mail.');
// Confirm deletion.
- $this->drupalPostForm(NULL, NULL, t('Cancel accounts'));
+ $this->drupalPostForm(NULL, [], t('Cancel accounts'));
$status = TRUE;
foreach ($users as $account) {
$status = $status && (strpos($this->getTextContent(), $account->getAccountName() . ' has been deleted.') !== FALSE);
diff --git a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
index b61606b9acd8149088d7f583ff55b0bcb33eb36a..d3a6ff4c3c7349779a773b3de38c43056aa6afe2 100644
--- a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -563,7 +563,7 @@ protected function loginFromResetEmail() {
preg_match('#.+user/reset/.+#', $email['body'], $urls);
$resetURL = $urls[0];
$this->drupalGet($resetURL);
- $this->drupalPostForm(NULL, NULL, 'Log in');
+ $this->drupalPostForm(NULL, [], 'Log in');
}
}
diff --git a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index 53ca77c7ccb015c90206d8b34bea94aa8cd03bf6..ac536b9f573953c4db994634b504b0c1330d855a 100644
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -108,7 +108,7 @@ public function testUserPasswordReset() {
$this->assertSession()->titleEquals('Reset password | Drupal');
// Check successful login.
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->assertSession()->linkExists('Log out');
$this->assertSession()->titleEquals($this->account->getAccountName() . ' | Drupal');
@@ -125,7 +125,7 @@ public function testUserPasswordReset() {
// Log out, and try to log in again using the same one-time link.
$this->drupalLogout();
$this->drupalGet($resetURL);
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->assertText(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'), 'One-time link is no longer valid.');
// Request a new password again, this time using the email address.
@@ -141,7 +141,7 @@ public function testUserPasswordReset() {
// not cause an error.
$resetURL = $this->getResetURL();
$this->drupalGet($resetURL);
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->drupalGet('user/' . $this->account->id() . '/edit');
$this->assertNoText('Expected user_string to be a string, NULL given');
$this->drupalLogout();
@@ -151,7 +151,7 @@ public function testUserPasswordReset() {
$bogus_timestamp = REQUEST_TIME - $timeout - 60;
$_uid = $this->account->id();
$this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account, $bogus_timestamp));
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->assertText(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'Expired password reset request rejected.');
// Create a user, block the account, and verify that a login link is denied.
@@ -178,7 +178,7 @@ public function testUserPasswordReset() {
$this->account->setEmail("1" . $this->account->getEmail());
$this->account->save();
$this->drupalGet($old_email_reset_link);
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->assertText(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'), 'One-time link is no longer valid.');
// Verify a password reset link will automatically log a user when /login is
@@ -225,7 +225,7 @@ public function testUserPasswordResetLoggedIn() {
$another_account = $this->drupalCreateUser();
$this->drupalLogin($another_account);
$this->drupalGet('user/password');
- $this->drupalPostForm(NULL, NULL, t('Submit'));
+ $this->drupalPostForm(NULL, [], t('Submit'));
// Click the reset URL while logged and change our password.
$resetURL = $this->getResetURL();
@@ -246,12 +246,12 @@ public function testUserPasswordResetLoggedIn() {
// Reset the password by username via the password reset page.
$this->drupalGet('user/password');
- $this->drupalPostForm(NULL, NULL, t('Submit'));
+ $this->drupalPostForm(NULL, [], t('Submit'));
// Click the reset URL while logged and change our password.
$resetURL = $this->getResetURL();
$this->drupalGet($resetURL);
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
// Change the password.
$password = \Drupal::service('password_generator')->generate();
@@ -452,7 +452,7 @@ public function testResetImpersonation() {
$reset_url = user_pass_reset_url($user1);
$attack_reset_url = str_replace("user/reset/{$user1->id()}", "user/reset/{$user2->id()}", $reset_url);
$this->drupalGet($attack_reset_url);
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
$this->assertNoText($user2->getAccountName(), 'The invalid password reset page does not show the user name.');
$this->assertSession()->addressEquals('user/password');
$this->assertText('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
diff --git a/core/modules/user/tests/src/Functional/UserSubAdminTest.php b/core/modules/user/tests/src/Functional/UserSubAdminTest.php
index 1200a2d947e040ffcf25882436ab59f9bcba9318..4e467f9e4557616243e251c6bd3955b452ab52b2 100644
--- a/core/modules/user/tests/src/Functional/UserSubAdminTest.php
+++ b/core/modules/user/tests/src/Functional/UserSubAdminTest.php
@@ -55,7 +55,7 @@ public function testSubAdmin() {
$this->assertSession()->responseContains('Disable the account and keep its content. This action cannot be undone.');
// Test that cancel confirmation gives an admin style message.
- $this->drupalPostForm(NULL, NULL, t('Cancel account'));
+ $this->drupalPostForm(NULL, [], t('Cancel account'));
$this->assertSession()->pageTextContains($cancel_user->getAccountName() . ' has been disabled.');
// Repeat with permission to select account cancellation method.
diff --git a/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ec20f25ac34a60cf76da1cfcfd0d02daa56d569
--- /dev/null
+++ b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace Drupal\Tests\user\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests the JS components added to the PasswordConfirm render element.
+ *
+ * @group user
+ */
+class PasswordConfirmWidgetTest extends WebDriverTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * WebAssert object.
+ *
+ * @var \Drupal\Tests\WebAssert
+ */
+ protected $assert;
+
+ /**
+ * User for testing.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $testUser;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+ $this->assert = $this->assertSession();
+
+ // Create a user.
+ $this->testUser = $this->createUser();
+ $this->drupalLogin($this->testUser);
+ }
+
+ /**
+ * Tests the components added to the password confirm widget.
+ */
+ public function testPasswordConfirmWidgetJsComponents() {
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+
+ $password_confirm_widget_selector = '.js-form-type-password-confirm.js-form-item-pass';
+ $password_parent_selector = '.js-form-item-pass-pass1';
+ $password_confirm_selector = '.js-form-item-pass-pass2';
+ $password_confirm_widget = $this->assert->elementExists('css', $password_confirm_widget_selector);
+ $password_parent_item = $password_confirm_widget->find('css', $password_parent_selector);
+ $password_confirm_item = $password_confirm_widget->find('css', $password_confirm_selector);
+
+ // Check that 'password-parent' and 'confirm-parent' are added to the
+ // appropriate elements.
+ $this->assertNotNull($this->assert->waitForElement('css', "$password_parent_selector.password-parent"));
+ $this->assertTrue($password_parent_item->hasClass('password-parent'));
+ $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector.confirm-parent"));
+ $this->assertTrue($password_confirm_item->hasClass('confirm-parent'));
+
+ // Check the elements of the main password item.
+ $this->assertTrue($password_parent_item->has('css', 'input.js-password-field'));
+
+ // Strength meter and bar.
+ $this->assertTrue($password_parent_item->has('css', 'input.js-password-field + .password-strength > [data-drupal-selector="password-strength-meter"]:first-child [data-drupal-selector="password-strength-indicator"]'));
+
+ // Password strength feedback. No strength text feedback present without
+ // input.
+ $this->assertTrue($password_parent_item->has('css', '.password-strength > [data-drupal-selector="password-strength-meter"] + .password-strength__title:last-child > [data-drupal-selector="password-strength-text"]'));
+ $this->assertEmpty($password_parent_item->find('css', '.password-strength > [data-drupal-selector="password-strength-meter"] + .password-strength__title:last-child > [data-drupal-selector="password-strength-text"]')->getText());
+
+ // Check the elements of the password confirm item.
+ $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm'));
+
+ // Check the password suggestions element.
+ $this->assertTrue($password_confirm_item->has('css', "$password_confirm_selector + .password-suggestions"));
+ $this->assertFalse($password_confirm_item->has('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+ $this->assertFalse($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+ $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->getHtml() === '');
+
+ // Fill only the main input for first.
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+
+ // Wait for the JS.
+ $this->assert->waitForElement('css', "$password_parent_selector.password-parent");
+
+ // Fill main input.
+ $password_confirm_widget->fillField('Password', 'o');
+
+ // Password tips should be refreshed and get visible.
+ $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+ $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+
+ // Password match message must become invisible.
+ $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+
+ // Password strength message should be updated.
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text" data-drupal-selector="password-strength-text">Weak</span></div>');
+
+ // Deleting the input must not change the element above.
+ $password_confirm_widget->fillField('Password', 'o');
+ $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text" data-drupal-selector="password-strength-text">Weak</span></div>');
+
+ // Now fill both the main and confirm input.
+ $password_confirm_widget->fillField('Password', 'oooooooooO0∘');
+ $password_confirm_widget->fillField('Confirm password', 'oooooooooO0∘');
+
+ // Bar should be 100% wide.
+ $this->assert->elementAttributeContains('css', 'input.js-password-field + .password-strength > [data-drupal-selector="password-strength-meter"] [data-drupal-selector="password-strength-indicator"]', 'style', 'width: 100%;');
+ $this->assert->elementTextContains('css', "$password_confirm_widget_selector $password_parent_selector [data-drupal-selector='password-strength-text']", 'Strong');
+
+ // Password match message must be visible.
+ $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"] > [data-drupal-selector="password-match-status-text"]')->hasClass('ok'));
+ $this->assert->elementTextContains('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"] > [data-drupal-selector="password-match-status-text"]', 'yes');
+
+ // Password suggestions should get invisible.
+ $this->assertFalse($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+ }
+
+ /**
+ * Ensures that password match message is visible when widget is initialized.
+ */
+ public function testPasswordConfirmMessage() {
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+ $password_confirm_widget_selector = '.js-form-type-password-confirm.js-form-item-pass';
+ $password_confirm_selector = '.js-form-item-pass-pass2';
+ $password_confirm_widget = $this->assert->elementExists('css', $password_confirm_widget_selector);
+ $password_confirm_item = $password_confirm_widget->find('css', $password_confirm_selector);
+
+ // Password match message.
+ $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]'));
+ $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector", '<div aria-live="polite" aria-atomic="true" class="password-confirm-message" data-drupal-selector="password-confirm-message">Passwords match: <span data-drupal-selector="password-match-status-text"></span></div>');
+ }
+
+ /**
+ * Tests the password confirm widget so that only confirm input is filled.
+ */
+ public function testFillConfirmOnly() {
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+ $password_confirm_widget_selector = '.js-form-type-password-confirm.js-form-item-pass';
+ $password_parent_selector = '.js-form-item-pass-pass1';
+ $password_confirm_selector = '.js-form-item-pass-pass2';
+ $password_confirm_widget = $this->assert->elementExists('css', $password_confirm_widget_selector);
+ $password_confirm_item = $password_confirm_widget->find('css', $password_confirm_selector);
+ $password_parent_item = $password_confirm_widget->find('css', $password_parent_selector);
+
+ // Fill only the confirm input.
+ $password_confirm_widget->fillField('Confirm password', 'o');
+
+ // Password tips should be refreshed and get visible.
+ $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+ $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+
+ // The appropriate strength text should appear.
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text" data-drupal-selector="password-strength-text">Weak</span></div>');
+
+ // Password match.
+ $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector [data-drupal-selector='password-confirm-message']", 'Passwords match: <span data-drupal-selector="password-match-status-text" class="error">no</span>');
+
+ // Deleting the input should hide the 'password match', but password
+ // strength and tips must remain visible.
+ $password_confirm_widget->fillField('Confirm password', '');
+ $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector [data-drupal-selector='password-confirm-message']", 'Passwords match: <span data-drupal-selector="password-match-status-text" class="error">no</span>');
+ $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+ $this->assertTrue($password_parent_item->find('css', '.password-strength > .password-strength__meter + .password-strength__title')->isVisible());
+ $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text" data-drupal-selector="password-strength-text">Weak</span></div>');
+ }
+
+}
diff --git a/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php b/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5cf76713bd7cbbee035aaa3f493cc8102ae13e4d
--- /dev/null
+++ b/core/modules/user/tests/src/FunctionalJavascript/PasswordWidgetThemeFunctionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\user\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests the JS components added to the PasswordConfirm render element.
+ *
+ * @group user
+ */
+class PasswordWidgetThemeFunctionTest extends WebDriverTestBase {
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'password_theme_function_test';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['user'];
+
+ /**
+ * User for testing.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $testUser;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+ $this->assert = $this->assertSession();
+
+ // Create a user.
+ $this->testUser = $this->createUser();
+ $this->drupalLogin($this->testUser);
+ }
+
+ /**
+ * Tests password widget theme functions and its deprecations.
+ *
+ * @group legacy
+ *
+ * @expectedDeprecation Javascript Deprecation: Returning <span> without data-drupal-selector="password-match-status-text" attribute is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3152101
+ * @expectedDeprecation Javascript Deprecation: The js-password-strength__indicator class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__indicator with a data-drupal-selector="password-strength-indicator" attribute. See https://www.drupal.org/node/3152101
+ * @expectedDeprecation Javascript Deprecation: The js-password-strength__text class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__text with a data-drupal-selector="password-strength-text" attribute. See https://www.drupal.org/node/3152101
+ * @expectedDeprecation Javascript Deprecation: The message property is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. The markup should be constructed using messageTips property and Drupal.theme.passwordSuggestions. See https://www.drupal.org/node/3130352
+ */
+ public function testPasswordConfirmWidgetJsComponents() {
+ $assert_session = $this->assertSession();
+
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+
+ $this->assertNotNull($assert_session->waitForText('Overridden passwordStrength:'));
+ $assert_session->elementTextContains('css', '.password-strength__meter', 'Overridden passwordStrength:');
+ $assert_session->elementTextContains('css', '.password-confirm-message', 'Overridden passwordConfirmMessage:');
+ $this->getSession()->getPage()->fillField('pass[pass1]', 'a');
+ $assert_session->elementTextContains('css', '.password-suggestions', 'Overridden passwordSuggestions:');
+ }
+
+}
diff --git a/core/modules/user/tests/src/FunctionalJavascript/UserPasswordResetTest.php b/core/modules/user/tests/src/FunctionalJavascript/UserPasswordResetTest.php
index 7de80ec0cf62cf7128c0a276a4e666d586275f77..9fceb27e18209e80a3874991166e9652c1e42888 100644
--- a/core/modules/user/tests/src/FunctionalJavascript/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/FunctionalJavascript/UserPasswordResetTest.php
@@ -92,7 +92,7 @@ public function testUserPasswordResetWithAdditionalAjaxForm() {
$this->drupalGet($resetURL);
// Login
- $this->drupalPostForm(NULL, NULL, t('Log in'));
+ $this->drupalPostForm(NULL, [], t('Log in'));
// Generate file.
$image_file = current($this->drupalGetTestFiles('image'));
diff --git a/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.es6.js b/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.es6.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ea87d3c888ab09edf543958e42f18727fd023ae
--- /dev/null
+++ b/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.es6.js
@@ -0,0 +1,91 @@
+/**
+ * @file
+ * Overrides password theme functions for testing.
+ */
+
+(Drupal => {
+ /**
+ * Constructs a password strength message.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.strengthTitle
+ * The title that precedes the strength text.
+ *
+ * @return {string}
+ * Markup for password strength message.
+ */
+ Drupal.theme.passwordStrength = ({ strengthTitle }) => {
+ const strengthIndicator =
+ '<span>Overridden passwordStrength:</span><div class="password-strength__indicator js-password-strength__indicator the-prior-class-is-deprecated" data-drupal-selector="a-distinct-absence-of-password-strength-indicator"></div>';
+ const strengthText =
+ '<span class="password-strength__text js-password-strength__text the-prior-class-is-deprecated" data-drupal-selector="a-distinct-absence-of-password-strength-text"></span>';
+ return `
+ <div class="password-strength">
+ <div class="password-strength__meter" data-drupal-selector="password-strength-meter">${strengthIndicator}</div>
+ <div aria-live="polite" aria-atomic="true" class="password-strength__title">${strengthTitle} ${strengthText}</div>
+ </div>
+ `;
+ };
+
+ /**
+ * Constructs password suggestions tips.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.hasWeaknesses
+ * The title that precedes tips.
+ * @param {Array.<string>} tips
+ * Array containing the tips.
+ *
+ * @return {string}
+ * Markup for password suggestions.
+ */
+ Drupal.theme.passwordSuggestions = ({ hasWeaknesses }, tips) =>
+ `<div class="password-suggestions">Overridden passwordSuggestions: ${
+ tips.length
+ ? `${hasWeaknesses}<ul><li>${tips.join('</li><li>')}</li></ul>`
+ : ''
+ }</div>`;
+
+ /**
+ * Constructs a password confirm message element.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.confirmTitle
+ * The translated confirm description that labels the actual confirm text.
+ *
+ * @return {string}
+ * Markup for the password confirm message.
+ */
+ Drupal.theme.passwordConfirmMessage = ({ confirmTitle }) => {
+ const confirmTextWrapper =
+ '<span>Overridden passwordConfirmMessage:</span><span data-drupal-selector="a-distinct-absence-of-password-match-status-text"></span>';
+ return `<div aria-live="polite" aria-atomic="true" class="password-confirm-message" data-drupal-selector="password-confirm-message">${confirmTitle} ${confirmTextWrapper}</div>`;
+ };
+
+ /**
+ * Confirm deprecation of property in evaluatePasswordStrength() return.
+ *
+ * @type {Drupal~behavior}
+ *
+ * @prop {Drupal~behaviorAttach} attach
+ * Attaches a check for the deprecated `message` property in the object
+ * returned by Drupal.evaluatePasswordStrength().
+ */
+ Drupal.behaviors.passwordThemeFunctionTest = {
+ attach(context, settings) {
+ const strength = Drupal.evaluatePasswordStrength(
+ 'password',
+ settings.password,
+ );
+
+ // eslint-disable-next-line no-unused-vars
+ const { message } = strength;
+ },
+ };
+})(Drupal);
diff --git a/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js b/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js
new file mode 100644
index 0000000000000000000000000000000000000000..06c0108577a42e34aa3c38cc13206b5e2782152c
--- /dev/null
+++ b/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js
@@ -0,0 +1,33 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.passwordStrength = function (_ref) {
+ var strengthTitle = _ref.strengthTitle;
+ var strengthIndicator = '<span>Overridden passwordStrength:</span><div class="password-strength__indicator js-password-strength__indicator the-prior-class-is-deprecated" data-drupal-selector="a-distinct-absence-of-password-strength-indicator"></div>';
+ var strengthText = '<span class="password-strength__text js-password-strength__text the-prior-class-is-deprecated" data-drupal-selector="a-distinct-absence-of-password-strength-text"></span>';
+ return "\n <div class=\"password-strength\">\n <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n </div>\n ");
+ };
+
+ Drupal.theme.passwordSuggestions = function (_ref2, tips) {
+ var hasWeaknesses = _ref2.hasWeaknesses;
+ return "<div class=\"password-suggestions\">Overridden passwordSuggestions: ".concat(tips.length ? "".concat(hasWeaknesses, "<ul><li>").concat(tips.join('</li><li>'), "</li></ul>") : '', "</div>");
+ };
+
+ Drupal.theme.passwordConfirmMessage = function (_ref3) {
+ var confirmTitle = _ref3.confirmTitle;
+ var confirmTextWrapper = '<span>Overridden passwordConfirmMessage:</span><span data-drupal-selector="a-distinct-absence-of-password-match-status-text"></span>';
+ return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
+ };
+
+ Drupal.behaviors.passwordThemeFunctionTest = {
+ attach: function attach(context, settings) {
+ var strength = Drupal.evaluatePasswordStrength('password', settings.password);
+ var message = strength.message;
+ }
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.info.yml b/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c7e210f9cda620b7fd599a0f3333bbd81edd595d
--- /dev/null
+++ b/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.info.yml
@@ -0,0 +1,7 @@
+name: 'Password Theme Function Test theme'
+type: theme
+base theme: stark
+description: 'Tests theme functions'
+version: VERSION
+libraries:
+ - password_theme_function_test/password-theme-functions
diff --git a/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.libraries.yml b/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.libraries.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3f2b7eec2231d7718489f22ff6c8812eefb97f78
--- /dev/null
+++ b/core/modules/user/tests/themes/password_theme_function_test/password_theme_function_test.libraries.yml
@@ -0,0 +1,6 @@
+password-theme-functions:
+ js:
+ js/password-theme-functions.js: {}
+ dependencies:
+ - core/drupal
+ - user/drupal.user
diff --git a/core/modules/user/user.es6.js b/core/modules/user/user.es6.js
index d5b8d20060d96f8e4d3f3990666b47cdb9e05f97..86c5b3a6e8c5e688a0059907130051075b41497b 100644
--- a/core/modules/user/user.es6.js
+++ b/core/modules/user/user.es6.js
@@ -3,7 +3,53 @@
* User behaviors.
*/
-(function($, Drupal, drupalSettings) {
+(($, Drupal) => {
+ /**
+ * An object containing CSS classes used for password widget.
+ *
+ * @type {object}
+ * @prop {string} passwordParent - A CSS class for the parent element.
+ * @prop {string} passwordsMatch - A CSS class indicating password match.
+ * @prop {string} passwordsNotMatch - A CSS class indicating passwords
+ * doesn't match.
+ * @prop {string} passwordWeak - A CSS class indicating weak password
+ * strength.
+ * @prop {string} passwordFair - A CSS class indicating fair password
+ * strength.
+ * @prop {string} passwordGood - A CSS class indicating good password
+ * strength.
+ * @prop {string} passwordStrong - A CSS class indicating strong password
+ * strength.
+ * @prop {string} widgetInitial - Initial CSS class that should be removed
+ * on a state change.
+ * @prop {string} passwordEmpty - A CSS class indicating password has not
+ * been filled.
+ * @prop {string} passwordFilled - A CSS class indicating password has
+ * been filled.
+ * @prop {string} confirmEmpty - A CSS class indicating password
+ * confirmation has not been filled.
+ * @prop {string} confirmFilled - A CSS class indicating password
+ * confirmation has been filled.
+ */
+ Drupal.user = {
+ password: {
+ css: {
+ passwordParent: 'password-parent',
+ passwordsMatch: 'ok',
+ passwordsNotMatch: 'error',
+ passwordWeak: 'is-weak',
+ passwordFair: 'is-fair',
+ passwordGood: 'is-good',
+ passwordStrong: 'is-strong',
+ widgetInitial: '',
+ passwordEmpty: '',
+ passwordFilled: '',
+ confirmEmpty: '',
+ confirmFilled: '',
+ },
+ },
+ };
+
/**
* Attach handlers to evaluate the strength of any password fields and to
* check that its confirmation is correct.
@@ -16,103 +62,225 @@
*/
Drupal.behaviors.password = {
attach(context, settings) {
- const $passwordInput = $(context)
+ const cssClasses = Drupal.user.password.css;
+ $(context)
.find('input.js-password-field')
- .once('password');
-
- if ($passwordInput.length) {
- const translate = settings.password;
-
- const $passwordInputParent = $passwordInput.parent();
- const $passwordInputParentWrapper = $passwordInputParent.parent();
- let $passwordSuggestions;
-
- // Add identifying class to password element parent.
- $passwordInputParent.addClass('password-parent');
-
- // Add the password confirmation layer.
- $passwordInputParentWrapper
- .find('input.js-password-confirm')
- .parent()
- .append(Drupal.theme('passwordConfirmMessage', translate))
- .addClass('confirm-parent');
-
- const $confirmInput = $passwordInputParentWrapper.find(
- 'input.js-password-confirm',
- );
- const $confirmResult = $passwordInputParentWrapper.find(
- 'div.js-password-confirm-message',
- );
- const $confirmChild = $confirmResult.find('span');
-
- // If the password strength indicator is enabled, add its markup.
- if (settings.password.showStrengthIndicator) {
- const passwordMeter = `<div class="password-strength"><div class="password-strength__meter"><div class="password-strength__indicator js-password-strength__indicator"></div></div><div aria-live="polite" aria-atomic="true" class="password-strength__title">${translate.strengthTitle} <span class="password-strength__text js-password-strength__text"></span></div></div>`;
- $confirmInput
+ .once('password')
+ .each((index, value) => {
+ const $mainInput = $(value);
+ const $mainInputParent = $mainInput
+ .parent()
+ .addClass(cssClasses.passwordParent);
+ const $passwordWidget = $mainInput.closest(
+ '.js-form-type-password-confirm',
+ );
+ const $confirmInput = $passwordWidget.find(
+ 'input.js-password-confirm',
+ );
+ const $passwordConfirmMessage = $(
+ Drupal.theme('passwordConfirmMessage', settings.password),
+ );
+
+ let $passwordMatchStatus = $passwordConfirmMessage
+ .find('[data-drupal-selector="password-match-status-text"]')
+ .first();
+ if ($passwordMatchStatus.length === 0) {
+ $passwordMatchStatus = $passwordConfirmMessage.find('span').first();
+ Drupal.deprecationError({
+ message:
+ 'Returning <span> without data-drupal-selector="password-match-status-text" attribute is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3152101',
+ });
+ }
+
+ const $confirmInputParent = $confirmInput
.parent()
- .after('<div class="password-suggestions description"></div>');
- $passwordInputParent.append(passwordMeter);
- $passwordSuggestions = $passwordInputParentWrapper
- .find('div.password-suggestions')
- .hide();
- }
-
- // Check that password and confirmation inputs match.
- const passwordCheckMatch = function(confirmInputVal) {
- const success = $passwordInput.val() === confirmInputVal;
- const confirmClass = success ? 'ok' : 'error';
-
- // Fill in the success message and set the class accordingly.
- $confirmChild
- .html(translate[`confirm${success ? 'Success' : 'Failure'}`])
- .removeClass('ok error')
- .addClass(confirmClass);
- };
-
- // Check the password strength.
- const passwordCheck = function() {
+ .addClass('confirm-parent')
+ .append($passwordConfirmMessage);
+
+ // List of classes to be removed from the strength bar on a state
+ // change.
+ const passwordStrengthBarClassesToRemove = [
+ cssClasses.passwordWeak || '',
+ cssClasses.passwordFair || '',
+ cssClasses.passwordGood || '',
+ cssClasses.passwordStrong || '',
+ ]
+ .join(' ')
+ .trim();
+
+ // List of classes to be removed from the text wrapper on a state
+ // change.
+ const confirmTextWrapperClassesToRemove = [
+ cssClasses.passwordsMatch || '',
+ cssClasses.passwordsNotMatch || '',
+ ]
+ .join(' ')
+ .trim();
+
+ // List of classes to be removed from the widget on a state change.
+ const widgetClassesToRemove = [
+ cssClasses.widgetInitial || '',
+ cssClasses.passwordEmpty || '',
+ cssClasses.passwordFilled || '',
+ cssClasses.confirmEmpty || '',
+ cssClasses.confirmFilled || '',
+ ]
+ .join(' ')
+ .trim();
+
+ const password = {};
+
+ // If the password strength indicator is enabled, add its markup.
if (settings.password.showStrengthIndicator) {
- // Evaluate the password strength.
- const result = Drupal.evaluatePasswordStrength(
- $passwordInput.val(),
- settings.password,
+ const $passwordStrength = $(
+ Drupal.theme('passwordStrength', settings.password),
);
-
- // Update the suggestions for how to improve the password.
- if ($passwordSuggestions.html() !== result.message) {
- $passwordSuggestions.html(result.message);
+ password.$strengthBar = $passwordStrength
+ .find('[data-drupal-selector="password-strength-indicator"]')
+ .first();
+ if (password.$strengthBar.length === 0) {
+ password.$strengthBar = $passwordStrength
+ .find('.js-password-strength__indicator')
+ .first();
+ Drupal.deprecationError({
+ message:
+ 'The js-password-strength__indicator class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__indicator with a data-drupal-selector="password-strength-indicator" attribute. See https://www.drupal.org/node/3152101',
+ });
}
+ password.$strengthTextWrapper = $passwordStrength
+ .find('[data-drupal-selector="password-strength-text"]')
+ .first();
+ if (password.$strengthTextWrapper.length === 0) {
+ password.$strengthTextWrapper = $passwordStrength
+ .find('.js-password-strength__text')
+ .first();
+ Drupal.deprecationError({
+ message:
+ 'The js-password-strength__text class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__text with a data-drupal-selector="password-strength-text" attribute. See https://www.drupal.org/node/3152101',
+ });
+ }
+ password.$suggestions = $(
+ Drupal.theme('passwordSuggestions', settings.password, []),
+ );
- // Only show the description box if a weakness exists in the
- // password.
- $passwordSuggestions.toggle(result.strength !== 100);
-
- // Adjust the length of the strength indicator.
- $passwordInputParent
- .find('.js-password-strength__indicator')
- .css('width', `${result.strength}%`)
- .removeClass('is-weak is-fair is-good is-strong')
- .addClass(result.indicatorClass);
-
- // Update the strength indication text.
- $passwordInputParent
- .find('.js-password-strength__text')
- .html(result.indicatorText);
+ password.$suggestions.hide();
+ $mainInputParent.append($passwordStrength);
+ $confirmInputParent.after(password.$suggestions);
}
- // Check the value in the confirm input and show results.
- if ($confirmInput.val()) {
- passwordCheckMatch($confirmInput.val());
- $confirmResult.css({ visibility: 'visible' });
- } else {
- $confirmResult.css({ visibility: 'hidden' });
+ /**
+ * Adds classes to the widget indicating if the elements are filled.
+ */
+ const addWidgetClasses = () => {
+ $passwordWidget
+ .addClass(
+ $mainInput.val()
+ ? cssClasses.passwordFilled
+ : cssClasses.passwordEmpty,
+ )
+ .addClass(
+ $confirmInput.val()
+ ? cssClasses.confirmFilled
+ : cssClasses.confirmEmpty,
+ );
+ };
+
+ /**
+ * Check that password and confirmation inputs match.
+ *
+ * @param {string} confirmInputVal
+ * The value of the confirm input.
+ */
+ const passwordCheckMatch = confirmInputVal => {
+ const passwordsAreMatching = $mainInput.val() === confirmInputVal;
+ const confirmClass = passwordsAreMatching
+ ? cssClasses.passwordsMatch
+ : cssClasses.passwordsNotMatch;
+ const confirmMessage = passwordsAreMatching
+ ? settings.password.confirmSuccess
+ : settings.password.confirmFailure;
+
+ // Update the success message and set the class if needed.
+ if (
+ !$passwordMatchStatus.hasClass(confirmClass) ||
+ !$passwordMatchStatus.html() === confirmMessage
+ ) {
+ if (confirmTextWrapperClassesToRemove) {
+ $passwordMatchStatus.removeClass(
+ confirmTextWrapperClassesToRemove,
+ );
+ }
+ $passwordMatchStatus.html(confirmMessage).addClass(confirmClass);
+ }
+ };
+
+ /**
+ * Checks the password strength.
+ */
+ const passwordCheck = () => {
+ if (settings.password.showStrengthIndicator) {
+ // Evaluate the password strength.
+ const result = Drupal.evaluatePasswordStrength(
+ $mainInput.val(),
+ settings.password,
+ );
+ const $currentPasswordSuggestions = $(
+ Drupal.theme(
+ 'passwordSuggestions',
+ settings.password,
+ result.messageTips,
+ ),
+ );
+
+ // Update the suggestions for how to improve the password if needed.
+ if (
+ password.$suggestions.html() !==
+ $currentPasswordSuggestions.html()
+ ) {
+ password.$suggestions.replaceWith($currentPasswordSuggestions);
+ password.$suggestions = $currentPasswordSuggestions.toggle(
+ // Only show the description box if a weakness exists in the
+ // password.
+ result.strength !== 100,
+ );
+ }
+
+ if (passwordStrengthBarClassesToRemove) {
+ password.$strengthBar.removeClass(
+ passwordStrengthBarClassesToRemove,
+ );
+ }
+ // Adjust the length of the strength indicator.
+ password.$strengthBar
+ .css('width', `${result.strength}%`)
+ .addClass(result.indicatorClass);
+
+ // Update the strength indication text.
+ password.$strengthTextWrapper.html(result.indicatorText);
+ }
+
+ // Check the value in the confirm input and show results.
+ if ($confirmInput.val()) {
+ passwordCheckMatch($confirmInput.val());
+ $passwordConfirmMessage.css({ visibility: 'visible' });
+ } else {
+ $passwordConfirmMessage.css({ visibility: 'hidden' });
+ }
+
+ if (widgetClassesToRemove) {
+ $passwordWidget.removeClass(widgetClassesToRemove);
+ addWidgetClasses();
+ }
+ };
+
+ if (widgetClassesToRemove) {
+ addWidgetClasses();
}
- };
- // Monitor input events.
- $passwordInput.on('input', passwordCheck);
- $confirmInput.on('input', passwordCheck);
- }
+ // Monitor input events.
+ $mainInput.on('input', passwordCheck);
+ $confirmInput.on('input', passwordCheck);
+ });
},
};
@@ -123,13 +291,14 @@
*
* @param {string} password
* The password to evaluate.
- * @param {object} translate
- * An object containing the text to display for each strength level.
+ * @param {object} passwordSettings
+ * A password settings object containing the text to display and the CSS
+ * classes for each strength level.
*
* @return {object}
* An object containing strength, message, indicatorText and indicatorClass.
*/
- Drupal.evaluatePasswordStrength = function(password, translate) {
+ Drupal.evaluatePasswordStrength = (password, passwordSettings) => {
password = password.trim();
let indicatorText;
let indicatorClass;
@@ -146,30 +315,30 @@
// otherwise use value from the database.
const $usernameBox = $('input.username');
const username =
- $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
+ $usernameBox.length > 0 ? $usernameBox.val() : passwordSettings.username;
// Lose 5 points for every character less than 12, plus a 30 point penalty.
if (password.length < 12) {
- msg.push(translate.tooShort);
+ msg.push(passwordSettings.tooShort);
strength -= (12 - password.length) * 5 + 30;
}
// Count weaknesses.
if (!hasLowercase) {
- msg.push(translate.addLowerCase);
- weaknesses++;
+ msg.push(passwordSettings.addLowerCase);
+ weaknesses += 1;
}
if (!hasUppercase) {
- msg.push(translate.addUpperCase);
- weaknesses++;
+ msg.push(passwordSettings.addUpperCase);
+ weaknesses += 1;
}
if (!hasNumbers) {
- msg.push(translate.addNumbers);
- weaknesses++;
+ msg.push(passwordSettings.addNumbers);
+ weaknesses += 1;
}
if (!hasPunctuation) {
- msg.push(translate.addPunctuation);
- weaknesses++;
+ msg.push(passwordSettings.addPunctuation);
+ weaknesses += 1;
}
// Apply penalty for each weakness (balanced against length penalty).
@@ -193,37 +362,46 @@
// Check if password is the same as the username.
if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
- msg.push(translate.sameAsUsername);
+ msg.push(passwordSettings.sameAsUsername);
// Passwords the same as username are always very weak.
strength = 5;
}
+ const cssClasses = Drupal.user.password.css;
+
// Based on the strength, work out what text should be shown by the
// password strength meter.
if (strength < 60) {
- indicatorText = translate.weak;
- indicatorClass = 'is-weak';
+ indicatorText = passwordSettings.weak;
+ indicatorClass = cssClasses.passwordWeak;
} else if (strength < 70) {
- indicatorText = translate.fair;
- indicatorClass = 'is-fair';
+ indicatorText = passwordSettings.fair;
+ indicatorClass = cssClasses.passwordFair;
} else if (strength < 80) {
- indicatorText = translate.good;
- indicatorClass = 'is-good';
+ indicatorText = passwordSettings.good;
+ indicatorClass = cssClasses.passwordGood;
} else if (strength <= 100) {
- indicatorText = translate.strong;
- indicatorClass = 'is-strong';
+ indicatorText = passwordSettings.strong;
+ indicatorClass = cssClasses.passwordStrong;
}
- // Assemble the final message.
- msg = `${translate.hasWeaknesses}<ul><li>${msg.join(
+ // Assemble the final message while keeping the original message array.
+ const messageTips = msg;
+ msg = `${passwordSettings.hasWeaknesses}<ul><li>${msg.join(
'</li><li>',
)}</li></ul>`;
- return {
- strength,
- message: msg,
- indicatorText,
- indicatorClass,
- };
+ return Drupal.deprecatedProperty({
+ target: {
+ strength,
+ message: msg,
+ indicatorText,
+ indicatorClass,
+ messageTips,
+ },
+ deprecatedProperty: 'message',
+ message:
+ 'The message property is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. The markup should be constructed using messageTips property and Drupal.theme.passwordSuggestions. See https://www.drupal.org/node/3130352',
+ });
};
-})(jQuery, Drupal, drupalSettings);
+})(jQuery, Drupal);
diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index b82261f7dd8b6651528f71c4b4ac6c39ae7f091e..db05be1dfef5eed05a6e7d4525ed43ed57210671 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -5,67 +5,139 @@
* @preserve
**/
-(function ($, Drupal, drupalSettings) {
+(function ($, Drupal) {
+ Drupal.user = {
+ password: {
+ css: {
+ passwordParent: 'password-parent',
+ passwordsMatch: 'ok',
+ passwordsNotMatch: 'error',
+ passwordWeak: 'is-weak',
+ passwordFair: 'is-fair',
+ passwordGood: 'is-good',
+ passwordStrong: 'is-strong',
+ widgetInitial: '',
+ passwordEmpty: '',
+ passwordFilled: '',
+ confirmEmpty: '',
+ confirmFilled: ''
+ }
+ }
+ };
Drupal.behaviors.password = {
attach: function attach(context, settings) {
- var $passwordInput = $(context).find('input.js-password-field').once('password');
-
- if ($passwordInput.length) {
- var translate = settings.password;
- var $passwordInputParent = $passwordInput.parent();
- var $passwordInputParentWrapper = $passwordInputParent.parent();
- var $passwordSuggestions;
- $passwordInputParent.addClass('password-parent');
- $passwordInputParentWrapper.find('input.js-password-confirm').parent().append(Drupal.theme('passwordConfirmMessage', translate)).addClass('confirm-parent');
- var $confirmInput = $passwordInputParentWrapper.find('input.js-password-confirm');
- var $confirmResult = $passwordInputParentWrapper.find('div.js-password-confirm-message');
- var $confirmChild = $confirmResult.find('span');
+ var cssClasses = Drupal.user.password.css;
+ $(context).find('input.js-password-field').once('password').each(function (index, value) {
+ var $mainInput = $(value);
+ var $mainInputParent = $mainInput.parent().addClass(cssClasses.passwordParent);
+ var $passwordWidget = $mainInput.closest('.js-form-type-password-confirm');
+ var $confirmInput = $passwordWidget.find('input.js-password-confirm');
+ var $passwordConfirmMessage = $(Drupal.theme('passwordConfirmMessage', settings.password));
+ var $passwordMatchStatus = $passwordConfirmMessage.find('[data-drupal-selector="password-match-status-text"]').first();
+
+ if ($passwordMatchStatus.length === 0) {
+ $passwordMatchStatus = $passwordConfirmMessage.find('span').first();
+ Drupal.deprecationError({
+ message: 'Returning <span> without data-drupal-selector="password-match-status-text" attribute is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3152101'
+ });
+ }
+
+ var $confirmInputParent = $confirmInput.parent().addClass('confirm-parent').append($passwordConfirmMessage);
+ var passwordStrengthBarClassesToRemove = [cssClasses.passwordWeak || '', cssClasses.passwordFair || '', cssClasses.passwordGood || '', cssClasses.passwordStrong || ''].join(' ').trim();
+ var confirmTextWrapperClassesToRemove = [cssClasses.passwordsMatch || '', cssClasses.passwordsNotMatch || ''].join(' ').trim();
+ var widgetClassesToRemove = [cssClasses.widgetInitial || '', cssClasses.passwordEmpty || '', cssClasses.passwordFilled || '', cssClasses.confirmEmpty || '', cssClasses.confirmFilled || ''].join(' ').trim();
+ var password = {};
if (settings.password.showStrengthIndicator) {
- var passwordMeter = "<div class=\"password-strength\"><div class=\"password-strength__meter\"><div class=\"password-strength__indicator js-password-strength__indicator\"></div></div><div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">".concat(translate.strengthTitle, " <span class=\"password-strength__text js-password-strength__text\"></span></div></div>");
- $confirmInput.parent().after('<div class="password-suggestions description"></div>');
- $passwordInputParent.append(passwordMeter);
- $passwordSuggestions = $passwordInputParentWrapper.find('div.password-suggestions').hide();
+ var $passwordStrength = $(Drupal.theme('passwordStrength', settings.password));
+ password.$strengthBar = $passwordStrength.find('[data-drupal-selector="password-strength-indicator"]').first();
+
+ if (password.$strengthBar.length === 0) {
+ password.$strengthBar = $passwordStrength.find('.js-password-strength__indicator').first();
+ Drupal.deprecationError({
+ message: 'The js-password-strength__indicator class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__indicator with a data-drupal-selector="password-strength-indicator" attribute. See https://www.drupal.org/node/3152101'
+ });
+ }
+
+ password.$strengthTextWrapper = $passwordStrength.find('[data-drupal-selector="password-strength-text"]').first();
+
+ if (password.$strengthTextWrapper.length === 0) {
+ password.$strengthTextWrapper = $passwordStrength.find('.js-password-strength__text').first();
+ Drupal.deprecationError({
+ message: 'The js-password-strength__text class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__text with a data-drupal-selector="password-strength-text" attribute. See https://www.drupal.org/node/3152101'
+ });
+ }
+
+ password.$suggestions = $(Drupal.theme('passwordSuggestions', settings.password, []));
+ password.$suggestions.hide();
+ $mainInputParent.append($passwordStrength);
+ $confirmInputParent.after(password.$suggestions);
}
+ var addWidgetClasses = function addWidgetClasses() {
+ $passwordWidget.addClass($mainInput.val() ? cssClasses.passwordFilled : cssClasses.passwordEmpty).addClass($confirmInput.val() ? cssClasses.confirmFilled : cssClasses.confirmEmpty);
+ };
+
var passwordCheckMatch = function passwordCheckMatch(confirmInputVal) {
- var success = $passwordInput.val() === confirmInputVal;
- var confirmClass = success ? 'ok' : 'error';
- $confirmChild.html(translate["confirm".concat(success ? 'Success' : 'Failure')]).removeClass('ok error').addClass(confirmClass);
+ var passwordsAreMatching = $mainInput.val() === confirmInputVal;
+ var confirmClass = passwordsAreMatching ? cssClasses.passwordsMatch : cssClasses.passwordsNotMatch;
+ var confirmMessage = passwordsAreMatching ? settings.password.confirmSuccess : settings.password.confirmFailure;
+
+ if (!$passwordMatchStatus.hasClass(confirmClass) || !$passwordMatchStatus.html() === confirmMessage) {
+ if (confirmTextWrapperClassesToRemove) {
+ $passwordMatchStatus.removeClass(confirmTextWrapperClassesToRemove);
+ }
+
+ $passwordMatchStatus.html(confirmMessage).addClass(confirmClass);
+ }
};
var passwordCheck = function passwordCheck() {
if (settings.password.showStrengthIndicator) {
- var result = Drupal.evaluatePasswordStrength($passwordInput.val(), settings.password);
+ var result = Drupal.evaluatePasswordStrength($mainInput.val(), settings.password);
+ var $currentPasswordSuggestions = $(Drupal.theme('passwordSuggestions', settings.password, result.messageTips));
+
+ if (password.$suggestions.html() !== $currentPasswordSuggestions.html()) {
+ password.$suggestions.replaceWith($currentPasswordSuggestions);
+ password.$suggestions = $currentPasswordSuggestions.toggle(result.strength !== 100);
+ }
- if ($passwordSuggestions.html() !== result.message) {
- $passwordSuggestions.html(result.message);
+ if (passwordStrengthBarClassesToRemove) {
+ password.$strengthBar.removeClass(passwordStrengthBarClassesToRemove);
}
- $passwordSuggestions.toggle(result.strength !== 100);
- $passwordInputParent.find('.js-password-strength__indicator').css('width', "".concat(result.strength, "%")).removeClass('is-weak is-fair is-good is-strong').addClass(result.indicatorClass);
- $passwordInputParent.find('.js-password-strength__text').html(result.indicatorText);
+ password.$strengthBar.css('width', "".concat(result.strength, "%")).addClass(result.indicatorClass);
+ password.$strengthTextWrapper.html(result.indicatorText);
}
if ($confirmInput.val()) {
passwordCheckMatch($confirmInput.val());
- $confirmResult.css({
+ $passwordConfirmMessage.css({
visibility: 'visible'
});
} else {
- $confirmResult.css({
+ $passwordConfirmMessage.css({
visibility: 'hidden'
});
}
+
+ if (widgetClassesToRemove) {
+ $passwordWidget.removeClass(widgetClassesToRemove);
+ addWidgetClasses();
+ }
};
- $passwordInput.on('input', passwordCheck);
+ if (widgetClassesToRemove) {
+ addWidgetClasses();
+ }
+
+ $mainInput.on('input', passwordCheck);
$confirmInput.on('input', passwordCheck);
- }
+ });
}
};
- Drupal.evaluatePasswordStrength = function (password, translate) {
+ Drupal.evaluatePasswordStrength = function (password, passwordSettings) {
password = password.trim();
var indicatorText;
var indicatorClass;
@@ -77,31 +149,31 @@
var hasNumbers = /[0-9]/.test(password);
var hasPunctuation = /[^a-zA-Z0-9]/.test(password);
var $usernameBox = $('input.username');
- var username = $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
+ var username = $usernameBox.length > 0 ? $usernameBox.val() : passwordSettings.username;
if (password.length < 12) {
- msg.push(translate.tooShort);
+ msg.push(passwordSettings.tooShort);
strength -= (12 - password.length) * 5 + 30;
}
if (!hasLowercase) {
- msg.push(translate.addLowerCase);
- weaknesses++;
+ msg.push(passwordSettings.addLowerCase);
+ weaknesses += 1;
}
if (!hasUppercase) {
- msg.push(translate.addUpperCase);
- weaknesses++;
+ msg.push(passwordSettings.addUpperCase);
+ weaknesses += 1;
}
if (!hasNumbers) {
- msg.push(translate.addNumbers);
- weaknesses++;
+ msg.push(passwordSettings.addNumbers);
+ weaknesses += 1;
}
if (!hasPunctuation) {
- msg.push(translate.addPunctuation);
- weaknesses++;
+ msg.push(passwordSettings.addPunctuation);
+ weaknesses += 1;
}
switch (weaknesses) {
@@ -123,30 +195,38 @@
}
if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
- msg.push(translate.sameAsUsername);
+ msg.push(passwordSettings.sameAsUsername);
strength = 5;
}
+ var cssClasses = Drupal.user.password.css;
+
if (strength < 60) {
- indicatorText = translate.weak;
- indicatorClass = 'is-weak';
+ indicatorText = passwordSettings.weak;
+ indicatorClass = cssClasses.passwordWeak;
} else if (strength < 70) {
- indicatorText = translate.fair;
- indicatorClass = 'is-fair';
+ indicatorText = passwordSettings.fair;
+ indicatorClass = cssClasses.passwordFair;
} else if (strength < 80) {
- indicatorText = translate.good;
- indicatorClass = 'is-good';
+ indicatorText = passwordSettings.good;
+ indicatorClass = cssClasses.passwordGood;
} else if (strength <= 100) {
- indicatorText = translate.strong;
- indicatorClass = 'is-strong';
+ indicatorText = passwordSettings.strong;
+ indicatorClass = cssClasses.passwordStrong;
}
- msg = "".concat(translate.hasWeaknesses, "<ul><li>").concat(msg.join('</li><li>'), "</li></ul>");
- return {
- strength: strength,
- message: msg,
- indicatorText: indicatorText,
- indicatorClass: indicatorClass
- };
+ var messageTips = msg;
+ msg = "".concat(passwordSettings.hasWeaknesses, "<ul><li>").concat(msg.join('</li><li>'), "</li></ul>");
+ return Drupal.deprecatedProperty({
+ target: {
+ strength: strength,
+ message: msg,
+ indicatorText: indicatorText,
+ indicatorClass: indicatorClass,
+ messageTips: messageTips
+ },
+ deprecatedProperty: 'message',
+ message: 'The message property is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. The markup should be constructed using messageTips property and Drupal.theme.passwordSuggestions. See https://www.drupal.org/node/3130352'
+ });
};
-})(jQuery, Drupal, drupalSettings);
\ No newline at end of file
+})(jQuery, Drupal);
\ No newline at end of file
diff --git a/core/modules/user/user.theme.es6.js b/core/modules/user/user.theme.es6.js
index 9c0e4432b58403d35757c8b80cf11c95ef3d1645..30db9e3b4cbf5513d2000f65e0c02385f82f16b5 100644
--- a/core/modules/user/user.theme.es6.js
+++ b/core/modules/user/user.theme.es6.js
@@ -5,11 +5,66 @@
(Drupal => {
/**
- * Constructs a password confirm message element
+ * Constructs a password confirm message element.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.confirmTitle
+ * The translated confirm description that labels the actual confirm text.
+ *
+ * @return {string}
+ * Markup for the password confirm message.
+ */
+ Drupal.theme.passwordConfirmMessage = ({ confirmTitle }) => {
+ const confirmTextWrapper =
+ '<span data-drupal-selector="password-match-status-text"></span>';
+ return `<div aria-live="polite" aria-atomic="true" class="password-confirm-message" data-drupal-selector="password-confirm-message">${confirmTitle} ${confirmTextWrapper}</div>`;
+ };
+
+ /**
+ * Constructs a password strength message.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.strengthTitle
+ * The title that precedes the strength text.
+ *
+ * @return {string}
+ * Markup for password strength message.
+ */
+ Drupal.theme.passwordStrength = ({ strengthTitle }) => {
+ const strengthIndicator =
+ '<div class="password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ const strengthText =
+ '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return `
+ <div class="password-strength">
+ <div class="password-strength__meter" data-drupal-selector="password-strength-meter">${strengthIndicator}</div>
+ <div aria-live="polite" aria-atomic="true" class="password-strength__title">${strengthTitle} ${strengthText}</div>
+ </div>
+ `;
+ };
+
+ /**
+ * Constructs password suggestions tips.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.hasWeaknesses
+ * The title that precedes tips.
+ * @param {Array.<string>} tips
+ * Array containing the tips.
*
* @return {string}
- * A string representing a DOM fragment.
+ * Markup for password suggestions.
*/
- Drupal.theme.passwordConfirmMessage = translate =>
- `<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">${translate.confirmTitle} <span></span></div>`;
+ Drupal.theme.passwordSuggestions = ({ hasWeaknesses }, tips) =>
+ `<div class="password-suggestions">${
+ tips.length
+ ? `${hasWeaknesses}<ul><li>${tips.join('</li><li>')}</li></ul>`
+ : ''
+ }</div>`;
})(Drupal);
diff --git a/core/modules/user/user.theme.js b/core/modules/user/user.theme.js
index 4e00e623192aa9f1c09741e48ab116dbe1a456f6..2a3ae1eeafd27835273651e570f43e715e4b98d5 100644
--- a/core/modules/user/user.theme.js
+++ b/core/modules/user/user.theme.js
@@ -6,7 +6,21 @@
**/
(function (Drupal) {
- Drupal.theme.passwordConfirmMessage = function (translate) {
- return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\">".concat(translate.confirmTitle, " <span></span></div>");
+ Drupal.theme.passwordConfirmMessage = function (_ref) {
+ var confirmTitle = _ref.confirmTitle;
+ var confirmTextWrapper = '<span data-drupal-selector="password-match-status-text"></span>';
+ return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
+ };
+
+ Drupal.theme.passwordStrength = function (_ref2) {
+ var strengthTitle = _ref2.strengthTitle;
+ var strengthIndicator = '<div class="password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ var strengthText = '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return "\n <div class=\"password-strength\">\n <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n </div>\n ");
+ };
+
+ Drupal.theme.passwordSuggestions = function (_ref3, tips) {
+ var hasWeaknesses = _ref3.hasWeaknesses;
+ return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(hasWeaknesses, "<ul><li>").concat(tips.join('</li><li>'), "</li></ul>") : '', "</div>");
};
})(Drupal);
\ No newline at end of file
diff --git a/core/modules/views/src/Plugin/views/area/Entity.php b/core/modules/views/src/Plugin/views/area/Entity.php
index c056e4d0c2e6591b6aa448635a1b64215b116270..e514c4fb1c37a440401772488e3f54a290e4eba9 100644
--- a/core/modules/views/src/Plugin/views/area/Entity.php
+++ b/core/modules/views/src/Plugin/views/area/Entity.php
@@ -132,8 +132,8 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
// @todo Use a method to check for tokens in
// https://www.drupal.org/node/2396607.
if (strpos($this->options['target'], '{{') === FALSE) {
- // @todo If the entity does not exist, this will will show the config
- // target identifier. Decide if this is the correct behavior in
+ // @todo If the entity does not exist, this will show the config target
+ // identifier. Decide if this is the correct behavior in
// https://www.drupal.org/node/2415391.
if ($target_entity = $this->entityRepository->loadEntityByConfigTarget($this->entityType, $this->options['target'])) {
$target = $target_entity->id();
diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
index 2c1be2d88ba9e40334add15fbaa24e64b6a2d960..cf280fb82524a5a8e838c1ac70ba9ebda58cda04 100644
--- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
@@ -439,8 +439,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#title' => $this->t('Path'),
'#description' => $this->t('This view will be displayed by visiting this path on your site. You may use "%" in your URL to represent values that will be used for contextual filters: For example, "node/%/feed". If needed you can even specify named route parameters like taxonomy/term/%taxonomy_term'),
'#default_value' => $this->getOption('path'),
- '#field_prefix' => '<span dir="ltr">' . Url::fromRoute('<none>', [], ['absolute' => TRUE])->toString(),
- '#field_suffix' => '</span>‎',
+ '#field_prefix' => '<span dir="ltr">' . Url::fromRoute('<none>', [], ['absolute' => TRUE])->toString() . '</span>‎',
'#attributes' => ['dir' => LanguageInterface::DIRECTION_LTR],
// Account for the leading backslash.
'#maxlength' => 254,
diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
index be84c8da16efa98d525fbb60765675657c53a1b9..ae2f4a919c378e2d87edb0fc050d608ff73f35fd 100644
--- a/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
@@ -59,10 +59,10 @@ public function testCalculateDependencies() {
$this->viewHandler->view->storage = $view_this;
$this->viewHandler->options['view_to_insert'] = 'other:default';
- $this->assertArrayEquals(['config' => ['view.other']], $this->viewHandler->calculateDependencies());
+ $this->assertEquals(['config' => ['view.other']], $this->viewHandler->calculateDependencies());
$this->viewHandler->options['view_to_insert'] = 'this:default';
- $this->assertArrayEquals([], $this->viewHandler->calculateDependencies());
+ $this->assertSame([], $this->viewHandler->calculateDependencies());
}
}
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index 5233cc21949dc5ed85af6d11fd5d911781ed4f43..e8f36e4a65eaa9de6d217d320e79c25592c2ce88 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -253,7 +253,7 @@ public function testActionLinks() {
$this->assertNoFieldByXpath('//input[@type="submit"]', 'Enable ' . $display_title);
// Disable the display so we can test the rendering of the "Enable" button.
- $this->drupalPostForm(NULL, NULL, 'Disable ' . $display_title);
+ $this->drupalPostForm(NULL, [], 'Disable ' . $display_title);
$this->assertFieldByXpath('//input[@type="submit"]', 'Enable ' . $display_title);
$this->assertNoFieldByXpath('//input[@type="submit"]', 'Disable ' . $display_title);
diff --git a/core/modules/workflows/tests/src/Unit/WorkflowTest.php b/core/modules/workflows/tests/src/Unit/WorkflowTest.php
index 3d242a10227de57d7838b3e4ae5745336e8f506a..63bf2f08ed7854f0ec6046f222ada1ad04776702 100644
--- a/core/modules/workflows/tests/src/Unit/WorkflowTest.php
+++ b/core/modules/workflows/tests/src/Unit/WorkflowTest.php
@@ -82,8 +82,8 @@ public function testGetStates() {
$workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
// Getting states works when there are none.
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getStates()));
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getStates([])));
+ $this->assertSame([], $workflow->getTypePlugin()->getStates());
+ $this->assertSame([], $workflow->getTypePlugin()->getStates([]));
$workflow
->getTypePlugin()
@@ -92,7 +92,7 @@ public function testGetStates() {
->addState('archived', 'Archived');
// States are stored in alphabetical key order.
- $this->assertArrayEquals([
+ $this->assertEquals([
'archived',
'draft',
'published',
@@ -102,21 +102,21 @@ public function testGetStates() {
$this->assertInstanceOf(State::class, $workflow->getTypePlugin()->getStates()['draft']);
// Passing in no IDs returns all states.
- $this->assertArrayEquals(['draft', 'published', 'archived'], array_keys($workflow->getTypePlugin()->getStates()));
+ $this->assertEquals(['draft', 'published', 'archived'], array_keys($workflow->getTypePlugin()->getStates()));
// The order of states is by weight.
$workflow->getTypePlugin()->setStateWeight('published', -1);
- $this->assertArrayEquals(['published', 'draft', 'archived'], array_keys($workflow->getTypePlugin()->getStates()));
+ $this->assertEquals(['published', 'draft', 'archived'], array_keys($workflow->getTypePlugin()->getStates()));
// The label is also used for sorting if weights are equal.
$workflow->getTypePlugin()->setStateWeight('archived', 0);
- $this->assertArrayEquals(['published', 'archived', 'draft'], array_keys($workflow->getTypePlugin()->getStates()));
+ $this->assertEquals(['published', 'archived', 'draft'], array_keys($workflow->getTypePlugin()->getStates()));
// You can limit the states returned by passing in states IDs.
- $this->assertArrayEquals(['archived', 'draft'], array_keys($workflow->getTypePlugin()->getStates(['draft', 'archived'])));
+ $this->assertEquals(['archived', 'draft'], array_keys($workflow->getTypePlugin()->getStates(['draft', 'archived'])));
// An empty array does not load all states.
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getStates([])));
+ $this->assertSame([], $workflow->getTypePlugin()->getStates([]));
}
/**
@@ -394,8 +394,8 @@ public function testGetTransitions() {
$workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
// Getting transitions works when there are none.
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getTransitions()));
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getTransitions([])));
+ $this->assertSame([], $workflow->getTypePlugin()->getTransitions());
+ $this->assertSame([], $workflow->getTypePlugin()->getTransitions([]));
// By default states are ordered in the order added.
$workflow
@@ -406,29 +406,29 @@ public function testGetTransitions() {
->addTransition('a_a', 'A to A', ['a'], 'a');
// Transitions are stored in alphabetical key order in configuration.
- $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getConfiguration()['transitions']));
+ $this->assertEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getConfiguration()['transitions']));
// Ensure we're returning transition objects.
$this->assertInstanceOf(Transition::class, $workflow->getTypePlugin()->getTransitions()['a_a']);
// Passing in no IDs returns all transitions.
- $this->assertArrayEquals(['a_b', 'a_a'], array_keys($workflow->getTypePlugin()->getTransitions()));
+ $this->assertEquals(['a_b', 'a_a'], array_keys($workflow->getTypePlugin()->getTransitions()));
// The order of states is by weight.
$workflow->getTypePlugin()->setTransitionWeight('a_a', -1);
- $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getTransitions()));
+ $this->assertEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getTransitions()));
// If all weights are equal it will fallback to labels.
$workflow->getTypePlugin()->setTransitionWeight('a_a', 0);
- $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getTransitions()));
+ $this->assertEquals(['a_a', 'a_b'], array_keys($workflow->getTypePlugin()->getTransitions()));
$workflow->getTypePlugin()->setTransitionLabel('a_b', 'A B');
- $this->assertArrayEquals(['a_b', 'a_a'], array_keys($workflow->getTypePlugin()->getTransitions()));
+ $this->assertEquals(['a_b', 'a_a'], array_keys($workflow->getTypePlugin()->getTransitions()));
// You can limit the states returned by passing in states IDs.
- $this->assertArrayEquals(['a_a'], array_keys($workflow->getTypePlugin()->getTransitions(['a_a'])));
+ $this->assertEquals(['a_a'], array_keys($workflow->getTypePlugin()->getTransitions(['a_a'])));
// An empty array does not load all states.
- $this->assertArrayEquals([], array_keys($workflow->getTypePlugin()->getTransitions([])));
+ $this->assertSame([], $workflow->getTypePlugin()->getTransitions([]));
}
/**
diff --git a/core/package.json b/core/package.json
index 35541686d31bbc47073257b45ef1cc1df057cb89..c97940e61e0981dcd5b9f27c3ee45b51145502b2 100644
--- a/core/package.json
+++ b/core/package.json
@@ -32,7 +32,6 @@
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.7.7",
- "autoprefixer": "^9.6.1",
"babel-plugin-add-header-comment": "^1.0.3",
"chalk": "^3.0.0",
"chokidar": "^3.3.1",
@@ -54,9 +53,9 @@
"nightwatch": "^1.2.1",
"postcss": "^7.0.18",
"postcss-calc": "^7.0.1",
- "postcss-custom-properties": "^9.0.2",
"postcss-header": "^2.0.0",
"postcss-import": "^12.0.1",
+ "postcss-preset-env": "^6.7.0",
"postcss-url": "^8.0.0",
"prettier": "^1.14.0",
"stylelint": "^13.0.0",
diff --git a/core/scripts/css/compile.js b/core/scripts/css/compile.js
index af16a01b8ec8ade798076723ecaa379c921cd7a7..6b1ad45e627b44c0d06cbcb31a617fe15fc31799 100644
--- a/core/scripts/css/compile.js
+++ b/core/scripts/css/compile.js
@@ -2,12 +2,11 @@ const chalk = require('chalk');
const log = require('./log');
const fs = require('fs');
const postcss = require('postcss');
-const postcssCustomProperties = require('postcss-custom-properties');
const postcssCalc = require("postcss-calc");
const postcssImport = require('postcss-import');
-const autoprefixer = require('autoprefixer');
const postcssHeader = require('postcss-header');
const postcssUrl = require('postcss-url');
+const postcssPresetEnv = require('postcss-preset-env');
module.exports = (filePath, callback) => {
// Transform the file.
@@ -31,17 +30,23 @@ module.exports = (filePath, callback) => {
}),
],
}),
- postcssCustomProperties({
- // Remove converted properties from the generated code. This needs to be
- // set to ensure that CSS minifiers don't remove the generated values.
+ postcssPresetEnv({
+ stage: 1,
preserve: false,
+ autoprefixer: {
+ cascade: false,
+ grid: 'no-autoplace',
+ },
+ features: {
+ 'blank-pseudo-class': false,
+ 'focus-visible-pseudo-class': false,
+ 'focus-within-pseudo-class': false,
+ 'has-pseudo-class': false,
+ 'image-set-function': false,
+ 'prefers-color-scheme-query': false,
+ }
}),
postcssCalc,
- autoprefixer({
- // Output without visual cascade for more consistency with existing
- // Drupal CSS.
- cascade: false
- }),
postcssHeader({
header: `/*\n * DO NOT EDIT THIS FILE.\n * See the following change record for more information,\n * https://www.drupal.org/node/3084859\n * @preserve\n */\n`,
}),
diff --git a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
index 0e8fee10215a6e3d3c9dc149fd9a8f0be866f96e..7bd4f7034714b4f85a2e8ca79011f0f7fcf5cec2 100644
--- a/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
+++ b/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
@@ -7,7 +7,7 @@
use Behat\Mink\Mink;
use Behat\Mink\Session;
use Drupal\Component\FileSystem\FileSystem as DrupalFilesystem;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
use Symfony\Component\Finder\Finder;
@@ -52,7 +52,7 @@
abstract class BuildTestBase extends TestCase {
use ExternalCommandRequirementsTrait;
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* The working directory where this test will manipulate files.
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php b/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
index 3719bcc64e5dac39e10c1e2d51585623c4f7dfab..605819c33820a17a04774887340627baa8a90961 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
@@ -77,7 +77,7 @@ public function uploadFileAndGetRemoteFilePath($path) {
$tempFilename = tempnam('', 'WebDriverZip');
$archive = new \ZipArchive();
- $result = $archive->open($tempFilename, \ZipArchive::CREATE);
+ $result = $archive->open($tempFilename, \ZipArchive::OVERWRITE);
if (!$result) {
throw new DriverException('Zip archive could not be created. Error ' . $result);
}
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroPasswordConfirmWidgetTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroPasswordConfirmWidgetTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bc4b68daa8dd0fd3c160022953e6b93b864a5ad
--- /dev/null
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroPasswordConfirmWidgetTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests\Theme;
+
+use Drupal\Tests\user\FunctionalJavascript\PasswordConfirmWidgetTest;
+
+/**
+ * Tests the password confirm widget with Claro theme.
+ *
+ * @group claro
+ */
+class ClaroPasswordConfirmWidgetTest extends PasswordConfirmWidgetTest {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'claro';
+
+ /**
+ * Tests that password match message is invisible when widget is initialized.
+ */
+ public function testPasswordConfirmMessage() {
+ $this->drupalGet($this->testUser->toUrl('edit-form'));
+ $password_confirm_widget_selector = '.js-form-type-password-confirm.js-form-item-pass';
+ $password_confirm_selector = '.js-form-item-pass-pass2';
+ $password_confirm_widget = $this->assert->elementExists('css', $password_confirm_widget_selector);
+ $password_confirm_item = $password_confirm_widget->find('css', $password_confirm_selector);
+
+ // Password match message.
+ $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]'));
+ $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + [data-drupal-selector="password-confirm-message"]')->isVisible());
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function testFillConfirmOnly() {
+ // This test is not applicable to Claro because confirm field is hidden
+ // until the password has been filled in the main field.
+ }
+
+}
diff --git a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
index e46331ba92701d94238269669075f8c618a8db8b..3c987c1542db5e19ff93517593705dc1ce7cdf0e 100644
--- a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
+++ b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -398,7 +398,7 @@ protected function assertRaw($raw) {
protected function assertNoRaw($raw) {
@trigger_error('AssertLegacyTrait::assertNoRaw() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotContains() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
if (func_num_args() > 1) {
- @trigger_error('Calling AssertLegacyTrait::assertNoRaw() with more that one argument is deprecated in drupal:8.2.0 and the method is removed from drupal:10.0.0. Use $this->assertSession()->responseContains() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
+ @trigger_error('Calling AssertLegacyTrait::assertNoRaw() with more that one argument is deprecated in drupal:8.2.0 and the method is removed from drupal:10.0.0. Use $this->assertSession()->responseNotContains() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
}
$this->assertSession()->responseNotContains($raw);
}
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index ae701b4945513747b640d99470168b77bc9343b4..9723712a9337cbb5f1edb094d7c01607167a2e49 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -133,7 +133,7 @@ public function testForm() {
$value = $config_factory->get('form_test.object')->get('bananas');
$this->assertSame('red', $value);
- $this->drupalPostForm('form-test/object-builder', NULL, 'Save');
+ $this->drupalPostForm('form-test/object-builder', [], 'Save');
$value = $config_factory->get('form_test.object')->get('bananas');
$this->assertSame('', $value);
@@ -852,6 +852,16 @@ public function testLegacyEscapingAssertions(): void {
$this->assertEscaped('Escaped: <"\'&>');
}
+ /**
+ * Tests deprecation of drupalPostForm().
+ *
+ * @group legacy
+ * @expectedDeprecation Calling Drupal\Tests\UiHelperTrait::drupalPostForm() with $edit set to NULL is deprecated in drupal:9.1.0 and the method is removed in drupal:10.0.0. Use $this->submitForm() instead. See https://www.drupal.org/node/3168858
+ */
+ public function testLegacyDrupalPostForm(): void {
+ $this->drupalPostForm(NULL, NULL, '');
+ }
+
/**
* Tests that deprecation headers do not get duplicated.
*
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
index 19c61996de93083e2b23def1a5708fbbf4a51208..c7c34018a68f18a4b1692d40e92890d3b9025506 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
@@ -20,6 +20,11 @@ class LibraryDiscoveryIntegrationTest extends KernelTestBase {
*/
protected $libraryDiscovery;
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['theme_test'];
+
/**
* {@inheritdoc}
*/
@@ -208,6 +213,22 @@ public function testLibrariesExtend() {
}
}
+ /**
+ * Test deprecated libraries.
+ *
+ * @group legacy
+ *
+ * @expectedDeprecation Theme "theme_test" is overriding a deprecated library. The "theme_test/deprecated_library" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com
+ * @expectedDeprecation Theme "theme_test" is extending a deprecated library. The "theme_test/another_deprecated_library" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com
+ * @expectedDeprecation The "theme_test/deprecated_library" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com
+ * @expectedDeprecation The "theme_test/another_deprecated_library" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com
+ */
+ public function testDeprecatedLibrary() {
+ $this->activateTheme('test_legacy_theme');
+ $this->libraryDiscovery->getLibraryByName('theme_test', 'deprecated_library');
+ $this->libraryDiscovery->getLibraryByName('theme_test', 'another_deprecated_library');
+ }
+
/**
* Activates a specified theme.
*
diff --git a/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
index f568f9d1b4923e9d85267dc9e5b6fde0105552ce..e1d7c2739f7614f642f9ad55684cb837c4a59100 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
@@ -67,14 +67,14 @@ public function testArrayArgumentsSQLInjection() {
public function testConditionOperatorArgumentsSQLInjection() {
$injection = "IS NOT NULL) ;INSERT INTO {test} (name) VALUES ('test12345678'); -- ";
- $previous_error_handler = set_error_handler(function ($severity, $message, $filename, $lineno, $context) use (&$previous_error_handler) {
+ $previous_error_handler = set_error_handler(function ($severity, $message, $filename, $lineno) use (&$previous_error_handler) {
// Normalize the filename to use UNIX directory separators.
if (preg_match('@core/lib/Drupal/Core/Database/Query/Condition.php$@', str_replace(DIRECTORY_SEPARATOR, '/', $filename))) {
// Convert errors to exceptions for testing purposes below.
throw new \ErrorException($message, 0, $severity, $filename, $lineno);
}
if ($previous_error_handler) {
- return $previous_error_handler($severity, $message, $filename, $lineno, $context);
+ return $previous_error_handler($severity, $message, $filename, $lineno);
}
});
try {
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index ae72732df2da0fd73c94c4968ca9fff1ba83eb37..ba7c5712fa1236ab9aa56871a65f866a662621b5 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -19,7 +19,7 @@
use Drupal\Tests\ConfigTestTrait;
use Drupal\Tests\RandomGeneratorTrait;
use Drupal\Tests\TestRequirementsTrait;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use Drupal\TestTools\Comparator\MarkupInterfaceComparator;
use PHPUnit\Framework\Exception;
use PHPUnit\Framework\TestCase;
@@ -78,7 +78,7 @@ abstract class KernelTestBase extends TestCase implements ServiceProviderInterfa
use RandomGeneratorTrait;
use ConfigTestTrait;
use TestRequirementsTrait;
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* {@inheritdoc}
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 0aac9ce74798f578f1a9a376d1f1f3d4bbd4d94d..448bb6a22b60b0d565556c141731ffae92a408a7 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -16,7 +16,7 @@
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use Drupal\Tests\user\Traits\UserCreationTrait;
use Drupal\TestTools\Comparator\MarkupInterfaceComparator;
use GuzzleHttp\Cookie\CookieJar;
@@ -64,7 +64,7 @@ abstract class BrowserTestBase extends TestCase {
createUser as drupalCreateUser;
}
use XdebugRequestTrait;
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* The database prefix of this test run.
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
index 96dab849123b6e71b6956c3df30d2309ed12b229..ecbd4f83c123b39af595532b1e2f232163f0b9ed 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
@@ -2,13 +2,13 @@
namespace Drupal\Tests\Composer\Plugin\Scaffold;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
/**
* Convenience class for creating fixtures.
*/
trait AssertUtilsTrait {
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* Asserts that a given file exists and is/is not a symlink.
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
index e37d06f1f544eb260c3b0e1ec20a72b2fe217cf1..ff189a37880bcbe3a474c61546f4e2e99897404b 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
@@ -5,7 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\AppendOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use PHPUnit\Framework\TestCase;
/**
@@ -14,7 +14,7 @@
* @group Scaffold
*/
class AppendOpTest extends TestCase {
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* @covers ::process
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
index cb5d6c7c4bb98152fed4db876d23aee2a2d67336..65de3c77c057a851ce9ba2119aea8cb9c955978e 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
@@ -5,7 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use PHPUnit\Framework\TestCase;
/**
@@ -14,7 +14,7 @@
* @group Scaffold
*/
class ReplaceOpTest extends TestCase {
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* @covers ::process
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
index ba8313bbce6ccf62b75efb6a45da969208bcb6fb..f2cb6cbd6e8848a9b82e9dab015a1d4075ff11f3 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
@@ -5,7 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\SkipOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use PHPUnit\Framework\TestCase;
/**
@@ -14,7 +14,7 @@
* @group Scaffold
*/
class SkipOpTest extends TestCase {
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* @covers ::process
diff --git a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
index 5e73f87ba3f043d20e5aeaec12da62ed317f2c5d..9be0f386b2043a99516fcac6cde9ceed7002c663 100644
--- a/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
@@ -74,7 +74,7 @@ public function testAssertRaw() {
/**
* @covers ::assertNoRaw
- * @expectedDeprecation Calling AssertLegacyTrait::assertNoRaw() with more that one argument is deprecated in drupal:8.2.0 and the method is removed from drupal:10.0.0. Use $this->assertSession()->responseContains() instead. See https://www.drupal.org/node/3129738
+ * @expectedDeprecation Calling AssertLegacyTrait::assertNoRaw() with more that one argument is deprecated in drupal:8.2.0 and the method is removed from drupal:10.0.0. Use $this->assertSession()->responseNotContains() instead. See https://www.drupal.org/node/3129738
*/
public function testAssertNoRaw() {
$this->page->getText()->willReturn('foo bar bar');
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
index 67d3170ab1d0a18f992d5e2e87d1d03df0f9a9ba..972de51d3b93edb0ffdf6a2c7a3a01f4dc9a54bc 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
@@ -4,6 +4,7 @@
use Drupal\Core\Asset\LibraryDiscoveryCollector;
use Drupal\Core\Cache\Cache;
+use Drupal\Core\Theme\ActiveTheme;
use Drupal\Tests\UnitTestCase;
/**
@@ -61,6 +62,23 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase {
'js' => [],
'css' => [],
],
+ 'test_3' => [
+ 'js' => [],
+ 'css' => [
+ 'theme' => [
+ 'foo.css' => [],
+ ],
+ ],
+ ],
+ 'test_4' => [
+ 'js' => [],
+ 'css' => [
+ 'theme' => [
+ 'bar.css' => [],
+ ],
+ ],
+ 'deprecated' => 'The "%library_id%" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use the test_3 library instead. See https://www.example.com',
+ ],
];
protected $activeTheme;
@@ -77,7 +95,6 @@ protected function setUp(): void {
$this->libraryDiscoveryParser = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscoveryParser')
->disableOriginalConstructor()
->getMock();
-
}
/**
@@ -86,10 +103,10 @@ protected function setUp(): void {
* @covers ::resolveCacheMiss
*/
public function testResolveCacheMiss() {
- $this->activeTheme = $this->getMockBuilder('Drupal\Core\Theme\ActiveTheme')
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
->disableOriginalConstructor()
->getMock();
- $this->themeManager->expects($this->exactly(3))
+ $this->themeManager->expects($this->exactly(5))
->method('getActiveTheme')
->willReturn($this->activeTheme);
$this->activeTheme->expects($this->once())
@@ -112,10 +129,10 @@ public function testResolveCacheMiss() {
* @covers ::destruct
*/
public function testDestruct() {
- $this->activeTheme = $this->getMockBuilder('Drupal\Core\Theme\ActiveTheme')
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
->disableOriginalConstructor()
->getMock();
- $this->themeManager->expects($this->exactly(3))
+ $this->themeManager->expects($this->exactly(5))
->method('getActiveTheme')
->willReturn($this->activeTheme);
$this->activeTheme->expects($this->once())
@@ -150,4 +167,93 @@ public function testDestruct() {
$this->libraryDiscoveryCollector->destruct();
}
+ /**
+ * Tests library with an extend.
+ *
+ * @covers ::applyLibrariesExtend
+ */
+ public function testLibrariesExtend() {
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->themeManager->expects($this->any())
+ ->method('getActiveTheme')
+ ->willReturn($this->activeTheme);
+ $this->activeTheme->expects($this->once())
+ ->method('getName')
+ ->willReturn('kitten_theme');
+ $this->activeTheme->expects($this->atLeastOnce())
+ ->method('getLibrariesExtend')
+ ->willReturn([
+ 'test/test_3' => [
+ 'kitten_theme/extend',
+ ],
+ ]);
+ $this->libraryDiscoveryParser->expects($this->at(0))
+ ->method('buildByExtension')
+ ->with('test')
+ ->willReturn($this->libraryData);
+ $this->libraryDiscoveryParser->expects($this->at(1))
+ ->method('buildByExtension')
+ ->with('kitten_theme')
+ ->willReturn([
+ 'extend' => [
+ 'css' => [
+ 'theme' => [
+ 'baz.css' => [],
+ ],
+ ],
+ ],
+ ]);
+ $library_discovery_collector = new LibraryDiscoveryCollector($this->cache, $this->lock, $this->libraryDiscoveryParser, $this->themeManager);
+ $libraries = $library_discovery_collector->get('test');
+ $this->assertSame(['foo.css', 'baz.css'], array_keys($libraries['test_3']['css']['theme']));
+ }
+
+ /**
+ * Tests a deprecated library with an extend.
+ *
+ * @covers ::applyLibrariesExtend
+ *
+ * @group legacy
+ *
+ * @expectedDeprecation Theme "test" is extending a deprecated library. The "test/test_4" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use the test_3 library instead. See https://www.example.com
+ */
+ public function testLibrariesExtendDeprecated() {
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->themeManager->expects($this->any())
+ ->method('getActiveTheme')
+ ->willReturn($this->activeTheme);
+ $this->activeTheme->expects($this->once())
+ ->method('getName')
+ ->willReturn('kitten_theme');
+ $this->activeTheme->expects($this->atLeastOnce())
+ ->method('getLibrariesExtend')
+ ->willReturn([
+ 'test/test_4' => [
+ 'kitten_theme/extend',
+ ],
+ ]);
+ $this->libraryDiscoveryParser->expects($this->at(0))
+ ->method('buildByExtension')
+ ->with('test')
+ ->willReturn($this->libraryData);
+ $this->libraryDiscoveryParser->expects($this->at(1))
+ ->method('buildByExtension')
+ ->with('kitten_theme')
+ ->willReturn([
+ 'extend' => [
+ 'css' => [
+ 'theme' => [
+ 'baz.css' => [],
+ ],
+ ],
+ ],
+ ]);
+ $library_discovery_collector = new LibraryDiscoveryCollector($this->cache, $this->lock, $this->libraryDiscoveryParser, $this->themeManager);
+ $library_discovery_collector->get('test');
+ }
+
}
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index 9f27d444f0cf2cf2198ea75a54e3b6e77f9d364c..99a930b5ee49a77a3c0ae2526906fe6cea32bad0 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -13,6 +13,8 @@
use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
use Drupal\Core\Asset\LibraryDiscoveryParser;
use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Drupal\Core\Theme\ActiveTheme;
+use Drupal\Core\Theme\ThemeManagerInterface;
use Drupal\Tests\UnitTestCase;
/**
@@ -49,6 +51,13 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
*/
protected $themeManager;
+ /**
+ * The mocked active theme.
+ *
+ * @var \Drupal\Core\Theme\ActiveTheme|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $activeTheme;
+
/**
* The mocked lock backend.
*
@@ -77,16 +86,16 @@ protected function setUp(): void {
parent::setUp();
$this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
- $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface');
- $mock_active_theme = $this->getMockBuilder('Drupal\Core\Theme\ActiveTheme')
+ $this->themeManager = $this->createMock(ThemeManagerInterface::class);
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
->disableOriginalConstructor()
->getMock();
- $mock_active_theme->expects($this->any())
+ $this->activeTheme->expects($this->any())
->method('getLibrariesOverride')
->willReturn([]);
$this->themeManager->expects($this->any())
->method('getActiveTheme')
- ->willReturn($mock_active_theme);
+ ->willReturn($this->activeTheme);
$this->streamWrapperManager = $this->createMock(StreamWrapperManagerInterface::class);
$this->librariesDirectoryFileFinder = $this->createMock(LibrariesDirectoryFileFinder::class);
$this->libraryDiscoveryParser = new TestLibraryDiscoveryParser($this->root, $this->moduleHandler, $this->themeManager, $this->streamWrapperManager, $this->librariesDirectoryFileFinder);
@@ -111,7 +120,7 @@ public function testBuildByExtensionSimple() {
$library = $libraries['example'];
$this->assertCount(0, $library['js']);
- $this->assertCount(1, $library['css']);
+ $this->assertCount(2, $library['css']);
$this->assertCount(0, $library['dependencies']);
$this->assertEquals($path . '/css/example.css', $library['css'][0]['data']);
@@ -544,6 +553,98 @@ public function testLibraryWithLicenses() {
$this->assertEquals($library['license'], $expected_license);
}
+ /**
+ * Tests libraries with overrides.
+ *
+ * @covers ::applyLibrariesOverride
+ */
+ public function testLibraryOverride() {
+ $mock_theme_path = 'mocked_themes/kittens';
+ $this->themeManager = $this->createMock(ThemeManagerInterface::class);
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->activeTheme->expects($this->atLeastOnce())
+ ->method('getLibrariesOverride')
+ ->willReturn([
+ $mock_theme_path => [
+ 'example_module/example' => [
+ 'css' => [
+ 'theme' => [
+ 'css/example.css' => 'css/overridden.css',
+ 'css/example2.css' => FALSE,
+ ],
+ ],
+ ],
+ ],
+ ]);
+ $this->themeManager->expects($this->any())
+ ->method('getActiveTheme')
+ ->willReturn($this->activeTheme);
+ $this->libraryDiscoveryParser = new TestLibraryDiscoveryParser($this->root, $this->moduleHandler, $this->themeManager, $this->streamWrapperManager, $this->librariesDirectoryFileFinder);
+
+ $this->moduleHandler->expects($this->atLeastOnce())
+ ->method('moduleExists')
+ ->with('example_module')
+ ->will($this->returnValue(TRUE));
+
+ $path = __DIR__ . '/library_test_files';
+ $path = substr($path, strlen($this->root) + 1);
+ $this->libraryDiscoveryParser->setPaths('module', 'example_module', $path);
+
+ $libraries = $this->libraryDiscoveryParser->buildByExtension('example_module');
+ $library = $libraries['example'];
+
+ $this->assertCount(0, $library['js']);
+ $this->assertCount(1, $library['css']);
+ $this->assertCount(0, $library['dependencies']);
+ $this->assertEquals($mock_theme_path . '/css/overridden.css', $library['css'][0]['data']);
+ }
+
+ /**
+ * Tests deprecated library with an override.
+ *
+ * @covers ::applyLibrariesOverride
+ *
+ * @group legacy
+ *
+ * @expectedDeprecation Theme "deprecated" is overriding a deprecated library. The "deprecated/deprecated" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com
+ */
+ public function testLibraryOverrideDeprecated() {
+ $mock_theme_path = 'mocked_themes/kittens';
+ $this->themeManager = $this->createMock(ThemeManagerInterface::class);
+ $this->activeTheme = $this->getMockBuilder(ActiveTheme::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->activeTheme->expects($this->atLeastOnce())
+ ->method('getLibrariesOverride')
+ ->willReturn([
+ $mock_theme_path => [
+ 'deprecated/deprecated' => [
+ 'css' => [
+ 'theme' => [
+ 'css/example.css' => 'css/overridden.css',
+ ],
+ ],
+ ],
+ ],
+ ]);
+ $this->themeManager->expects($this->any())
+ ->method('getActiveTheme')
+ ->willReturn($this->activeTheme);
+ $this->libraryDiscoveryParser = new TestLibraryDiscoveryParser($this->root, $this->moduleHandler, $this->themeManager, $this->streamWrapperManager, $this->librariesDirectoryFileFinder);
+
+ $this->moduleHandler->expects($this->atLeastOnce())
+ ->method('moduleExists')
+ ->with('deprecated')
+ ->will($this->returnValue(TRUE));
+
+ $path = __DIR__ . '/library_test_files';
+ $path = substr($path, strlen($this->root) + 1);
+ $this->libraryDiscoveryParser->setPaths('module', 'deprecated', $path);
+ $this->libraryDiscoveryParser->buildByExtension('deprecated');
+ }
+
/**
* Verifies assertions catch invalid CSS declarations.
*
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
index e4bed4e3a4ebaf0659a31fd6032a17e17adb931a..dcb3b0f19660258d74af5bb2b3dda47c49e02d1b 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php
@@ -103,13 +103,13 @@ public function testGetLibraryByName() {
* Tests getting a deprecated library.
*/
public function testAssetLibraryDeprecation() {
- $previous_error_handler = set_error_handler(function ($severity, $message, $file, $line, $context) use (&$previous_error_handler) {
+ $previous_error_handler = set_error_handler(function ($severity, $message, $file, $line) use (&$previous_error_handler) {
// Convert deprecation error into a catchable exception.
if ($severity === E_USER_DEPRECATED) {
throw new \ErrorException($message, 0, $severity, $file, $line);
}
if ($previous_error_handler) {
- return $previous_error_handler($severity, $message, $file, $line, $context);
+ return $previous_error_handler($severity, $message, $file, $line);
}
});
diff --git a/core/tests/Drupal/Tests/Core/Asset/library_test_files/deprecated.libraries.yml b/core/tests/Drupal/Tests/Core/Asset/library_test_files/deprecated.libraries.yml
new file mode 100644
index 0000000000000000000000000000000000000000..090bf4346e7b7af1cdbd0424796225e1d30762c0
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Asset/library_test_files/deprecated.libraries.yml
@@ -0,0 +1,6 @@
+deprecated:
+ version: VERSION
+ css:
+ theme:
+ css/example.css: {}
+ deprecated: 'The "%library_id%" asset library is deprecated in drupal:X.0.0 and is removed from drupal:Y.0.0. Use another library instead. See https://www.example.com'
diff --git a/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_module.libraries.yml b/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_module.libraries.yml
index 653438ce90d1d0cc846e714bf2b446c5a38e8b0a..ae80a32e2b4a6862600fec5ea015a6472520dfa6 100644
--- a/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_module.libraries.yml
+++ b/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_module.libraries.yml
@@ -3,3 +3,4 @@ example:
css:
theme:
css/example.css: {}
+ css/example2.css: {}
diff --git a/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php b/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
index e0ac9089c5f2e424dd166fa548e1d31b68b7d898..64c0963004c24fbe71168e9cec38af758a727e8f 100644
--- a/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
@@ -172,7 +172,7 @@ public function testSetQueue() {
->setQueue('BatchName', '\Drupal\Core\Queue\Batch')
->toArray();
- $this->assertArrayEquals([
+ $this->assertEquals([
'name' => 'BatchName',
'class' => '\Drupal\Core\Queue\Batch',
], $batch['queue'], 'Batch queue has been set.');
diff --git a/core/tests/Drupal/Tests/Core/Config/NullStorageTest.php b/core/tests/Drupal/Tests/Core/Config/NullStorageTest.php
index 6ffacdd78545d867b6f5aa1a6dfed2f31dbec738..c281ebf4816e7a9df344483080b24e87c339d973 100644
--- a/core/tests/Drupal/Tests/Core/Config/NullStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/NullStorageTest.php
@@ -22,7 +22,7 @@ public function testCollection() {
$this->assertInstanceOf(StorageInterface::class, $collection);
$this->assertEquals(StorageInterface::DEFAULT_COLLECTION, $nullStorage->getCollectionName());
$this->assertEquals('test', $collection->getCollectionName());
- $this->assertArrayEquals([], $collection->getAllCollectionNames());
+ $this->assertSame([], $collection->getAllCollectionNames());
}
}
diff --git a/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php b/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
index 0d140527297f503276d2c79eb997904f9616f31e..3b0f780779608bd1f34751e278d28e6a84d52b34 100644
--- a/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
@@ -28,7 +28,7 @@ public function testReplaceStorageContents($source_collections, $target_collecti
$source = new MemoryStorage();
$target = new MemoryStorage();
// Empty the storage should be the same.
- $this->assertArrayEquals(self::toArray($source), self::toArray($target));
+ $this->assertEquals(self::toArray($source), self::toArray($target));
// When the source is populated, they are not the same any more.
$this->generateRandomData($source, $source_collections);
@@ -54,9 +54,9 @@ public function testReplaceStorageContents($source_collections, $target_collecti
// After copying they are the same, this asserts that items not present
// in the source get removed from the target.
self::replaceStorageContents($source, $target);
- $this->assertArrayEquals($source_data, self::toArray($target));
+ $this->assertEquals($source_data, self::toArray($target));
// Assert that the copy method did indeed not change the source.
- $this->assertArrayEquals($source_data, self::toArray($source));
+ $this->assertEquals($source_data, self::toArray($source));
// Assert that the active collection is the same as the original source.
$this->assertEquals($source_name, $source->getCollectionName());
@@ -154,7 +154,7 @@ public function testWithInvalidConfiguration() {
$this->assertFalse($target->exists($name));
}
else {
- $this->assertArrayEquals($source->read($name), $target->read($name));
+ $this->assertEquals($source->read($name), $target->read($name));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index 04f5eb1cb4716e40a3f1bf61028e00364856dcc9..09c938f3b1ff197c91b122e7d79854057647b538 100644
--- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -412,7 +412,7 @@ public function testFormattedDateDiff() {
'max-age' => $max_age,
],
];
- $this->assertArrayEquals($expected, $object->toRenderable());
+ $this->assertEquals($expected, $object->toRenderable());
// Test retrieving the formatted time difference string.
$this->assertEquals($string, $object->getString());
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index 74a9129c6dd42075594cc007cbd99026f037509e..3e1efe049e72fe762e7e739414254ac51a895456 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -598,7 +598,7 @@ public function testGetFields($expected, $include_computed, $is_computed, $field
->willReturnArgument(0);
// Exercise getFields().
- $this->assertArrayEquals(
+ $this->assertEquals(
$expected,
$mock_base->getFields($include_computed)
);
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityConstraintViolationListTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityConstraintViolationListTest.php
index 4afbfe18b6e6b8bc8597142ecf5cfa85a5ca3791..cb427f6a20a66a517f83db9c2a4a06aa5cc1ece0 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityConstraintViolationListTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityConstraintViolationListTest.php
@@ -27,7 +27,7 @@ public function testFilterByFields() {
$this->assertSame($constraint_list->filterByFields(['name']), $constraint_list);
$this->assertCount(4, $constraint_list);
- $this->assertArrayEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
+ $this->assertEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
}
/**
@@ -42,7 +42,7 @@ public function testFilterByFieldsWithCompositeConstraints() {
$this->assertSame($constraint_list->filterByFields(['name']), $constraint_list);
$this->assertCount(4, $constraint_list);
- $this->assertArrayEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
+ $this->assertEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
}
/**
@@ -57,7 +57,7 @@ public function testFilterByFieldAccess() {
$this->assertSame($constraint_list->filterByFieldAccess($account), $constraint_list);
$this->assertCount(4, $constraint_list);
- $this->assertArrayEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
+ $this->assertEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
}
/**
@@ -72,7 +72,7 @@ public function testFilterByFieldAccessWithCompositeConstraint() {
$this->assertSame($constraint_list->filterByFieldAccess($account), $constraint_list);
$this->assertCount(4, $constraint_list);
- $this->assertArrayEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
+ $this->assertEquals(array_values(iterator_to_array($constraint_list)), [$violations[2], $violations[3], $violations[4], $violations[5]]);
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
index fbd522230316b35aeec87f0f0dcfdb3528dbe83c..0fc8e36b993fafcfe2ca22d32dc7b228c8eaeed9 100644
--- a/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
+++ b/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
@@ -349,7 +349,7 @@ public function testDefaultValuesFormSubmit() {
$field_list->expects($this->never())
->method('getValue');
- $this->assertArrayEquals([], $field_list->defaultValuesFormSubmit([], $form, $form_state));
+ $this->assertSame([], $field_list->defaultValuesFormSubmit([], $form, $form_state));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
index 975e3e4ece95dc7ad6abf376f7eca6043868705a..a8f61b45b09633c0484ca6676995c6dd6b47e910 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
@@ -212,7 +212,7 @@ public function testExistingDerivative() {
$expected = $definitions['non_container_aware_discovery'];
$expected['id'] = 'non_container_aware_discovery:test_discovery_1';
- $this->assertArrayEquals($expected, $returned_definitions['non_container_aware_discovery:test_discovery_1']);
+ $this->assertEquals($expected, $returned_definitions['non_container_aware_discovery:test_discovery_1']);
}
/**
@@ -252,7 +252,7 @@ public function testSingleExistingDerivative() {
$expected = $base_definition;
$expected['id'] = 'non_container_aware_discovery:test_discovery_1';
- $this->assertArrayEquals($expected, $discovery->getDefinition('non_container_aware_discovery:test_discovery_1'));
+ $this->assertEquals($expected, $discovery->getDefinition('non_container_aware_discovery:test_discovery_1'));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php b/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php
index ae233a5cb9188d58358317fccd91688543d14781..33f9323bbafc82a7fb6cd87000da7e9f59af8a48 100644
--- a/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php
@@ -5,6 +5,8 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Session\AccountProxy;
use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+use Symfony\Contracts\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
/**
@@ -19,6 +21,7 @@ class AccountProxyTest extends UnitTestCase {
*/
public function testId() {
$dispatcher = $this->prophesize(EventDispatcherInterface::class);
+ $dispatcher->dispatch(Argument::any(), Argument::any())->willReturn(new Event());
$account_proxy = new AccountProxy($dispatcher->reveal());
$this->assertSame(0, $account_proxy->id());
$account_proxy->setInitialAccountId(1);
@@ -39,6 +42,7 @@ public function testId() {
public function testSetInitialAccountIdException() {
$this->expectException(\LogicException::class);
$dispatcher = $this->prophesize(EventDispatcherInterface::class);
+ $dispatcher->dispatch(Argument::any(), Argument::any())->willReturn(new Event());
$account_proxy = new AccountProxy($dispatcher->reveal());
$current_user = $this->prophesize(AccountInterface::class);
$account_proxy->setAccount($current_user->reveal());
diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index 81a1312198c0792bcd642f9d2db4b90963eb6c5c..9107cb90727a6c1b2724502473051763ac4a9274 100644
--- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -94,7 +94,7 @@ public function testSetAttribute() {
// Test adding array to class.
$attribute = new Attribute();
$attribute->setAttribute('class', ['kitten', 'cat']);
- $this->assertArrayEquals(['kitten', 'cat'], $attribute['class']->value());
+ $this->assertEquals(['kitten', 'cat'], $attribute['class']->value());
// Test adding boolean attributes.
$attribute = new Attribute();
@@ -174,19 +174,19 @@ public function testAddClasses() {
// Add one class on empty attribute.
$attribute->addClass('banana');
- $this->assertArrayEquals(['banana'], $attribute['class']->value());
+ $this->assertEquals(['banana'], $attribute['class']->value());
// Add one class.
$attribute->addClass('aa');
- $this->assertArrayEquals(['banana', 'aa'], $attribute['class']->value());
+ $this->assertEquals(['banana', 'aa'], $attribute['class']->value());
// Add multiple classes.
$attribute->addClass('xx', 'yy');
- $this->assertArrayEquals(['banana', 'aa', 'xx', 'yy'], $attribute['class']->value());
+ $this->assertEquals(['banana', 'aa', 'xx', 'yy'], $attribute['class']->value());
// Add an array of classes.
$attribute->addClass(['red', 'green', 'blue']);
- $this->assertArrayEquals(['banana', 'aa', 'xx', 'yy', 'red', 'green', 'blue'], $attribute['class']->value());
+ $this->assertEquals(['banana', 'aa', 'xx', 'yy', 'red', 'green', 'blue'], $attribute['class']->value());
// Add an array of duplicate classes.
$attribute->addClass(['red', 'green', 'blue'], ['aa', 'aa', 'banana'], 'yy');
@@ -218,7 +218,7 @@ public function testRemoveClasses() {
$attribute->removeClass('gg');
$this->assertNotContains(['gg'], $attribute['class']->value());
// Test that the array index remains sequential.
- $this->assertArrayEquals(['aa'], $attribute['class']->value());
+ $this->assertEquals(['aa'], $attribute['class']->value());
$attribute->removeClass('aa');
$this->assertEmpty((string) $attribute);
@@ -254,7 +254,7 @@ public function testChainAddRemoveClasses() {
->addClass(['apple', 'lime', 'grapefruit'])
->addClass(['banana']);
$expected = ['example-class', 'blue', 'apple', 'lime', 'grapefruit', 'banana'];
- $this->assertArrayEquals($expected, $attribute['class']->value(), 'Attributes chained');
+ $this->assertEquals($expected, $attribute['class']->value(), 'Attributes chained');
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php b/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
index ccb00ff82c9b69ac501fab41c806a5aef8f45c54..7ae45e2fe8f89804aac8dae7e98dfeec28144db8 100644
--- a/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
@@ -49,7 +49,7 @@ public function testXmlToRowsWithErrors() {
public function testXmlToRowsEmptyFile() {
// File system with an empty XML file.
vfsStream::setup('junit_test', NULL, ['empty.xml' => '']);
- $this->assertArrayEquals([], JUnitConverter::xmlToRows(23, vfsStream::url('junit_test/empty.xml')));
+ $this->assertSame([], JUnitConverter::xmlToRows(23, vfsStream::url('junit_test/empty.xml')));
}
/**
@@ -76,7 +76,7 @@ public function testXmlElementToRows() {
'file' => '/Users/paul/projects/drupal/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php',
],
];
- $this->assertArrayEquals($simpletest, JUnitConverter::xmlElementToRows(23, new \SimpleXMLElement($junit)));
+ $this->assertEquals($simpletest, JUnitConverter::xmlElementToRows(23, new \SimpleXMLElement($junit)));
}
/**
@@ -96,7 +96,7 @@ public function testConvertTestCaseToSimpletestRow() {
'line' => 108,
'file' => '/Users/paul/projects/drupal/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php',
];
- $this->assertArrayEquals($simpletest, JUnitConverter::convertTestCaseToSimpletestRow(23, new \SimpleXMLElement($junit)));
+ $this->assertEquals($simpletest, JUnitConverter::convertTestCaseToSimpletestRow(23, new \SimpleXMLElement($junit)));
}
}
diff --git a/core/tests/Drupal/Tests/Core/Test/RunTests/TestFileParserTest.php b/core/tests/Drupal/Tests/Core/Test/RunTests/TestFileParserTest.php
index 4086368f276d1af89aa389b01dbf991ae7011a7f..21a38e9e11d1e6ac2ac236e63a3329d19f285fb4 100644
--- a/core/tests/Drupal/Tests/Core/Test/RunTests/TestFileParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/RunTests/TestFileParserTest.php
@@ -81,11 +81,11 @@ public function testParseContents($expected, $contents) {
*/
public function testGetTestListFromFile() {
$parser = new TestFileParser();
- $this->assertArrayEquals(
+ $this->assertEquals(
['Drupal\Tests\Core\Test\RunTests\TestFileParserTest'],
$parser->getTestListFromFile(__FILE__)
);
- $this->assertArrayEquals(
+ $this->assertEquals(
['Drupal\KernelTests\Core\Datetime\Element\TimezoneTest'],
$parser->getTestListFromFile(__DIR__ . '/../../../../KernelTests/Core/Datetime/Element/TimezoneTest.php')
);
diff --git a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
index c10c484647f9320f0e33864462ed71a06b4e7739..41e95e4283470af6c61fb2913229c60c8f9d2a9e 100644
--- a/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
@@ -190,7 +190,7 @@ public function testPostProcessExtension($defined_functions, $hooks, $expected)
$reflection_method->setAccessible(TRUE);
$reflection_method->invokeArgs($this->registry, [&$hooks, $theme->reveal()]);
- $this->assertArrayEquals($expected, $hooks);
+ $this->assertEquals($expected, $hooks);
}
/**
diff --git a/core/tests/Drupal/Tests/PhpUnitWarningsTest.php b/core/tests/Drupal/Tests/PhpUnitWarningsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a741265e3439d802c81b7b20e69ea7617039098
--- /dev/null
+++ b/core/tests/Drupal/Tests/PhpUnitWarningsTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Drupal\Tests;
+
+/**
+ * @coversDefaultClass \Drupal\Tests\Traits\PhpUnitWarnings
+ * @group legacy
+ */
+class PhpUnitWarningsTest extends UnitTestCase {
+
+ /**
+ * @expectedDeprecation Test warning for \Drupal\Tests\PhpUnitWarningsTest::testAddWarning()
+ */
+ public function testAddWarning() {
+ $this->addWarning('Test warning for \Drupal\Tests\PhpUnitWarningsTest::testAddWarning()');
+ }
+
+ /**
+ * @expectedDeprecation Using assertContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringContainsString() or assertStringContainsStringIgnoringCase() instead.
+ * @expectedDeprecation The optional $ignoreCase parameter of assertContains() is deprecated and will be removed in PHPUnit 9.
+ */
+ public function testAssertContains() {
+ $this->assertContains('string', 'aaaa_string_aaa');
+ $this->assertContains('STRING', 'aaaa_string_aaa', '', TRUE);
+ }
+
+ /**
+ * @expectedDeprecation Using assertNotContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringNotContainsString() or assertStringNotContainsStringIgnoringCase() instead.
+ * @expectedDeprecation The optional $ignoreCase parameter of assertNotContains() is deprecated and will be removed in PHPUnit 9.
+ */
+ public function testAssertNotContains() {
+ $this->assertNotContains('foo', 'bar');
+ $this->assertNotContains('FOO', 'bar', '', TRUE);
+ }
+
+ /**
+ * @expectedDeprecation assertArraySubset() is deprecated and will be removed in PHPUnit 9.
+ */
+ public function testAssertArraySubset() {
+ $this->assertArraySubset(['a'], ['a', 'b']);
+ }
+
+ /**
+ * @expectedDeprecation assertInternalType() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertIsArray(), assertIsBool(), assertIsFloat(), assertIsInt(), assertIsNumeric(), assertIsObject(), assertIsResource(), assertIsString(), assertIsScalar(), assertIsCallable(), or assertIsIterable() instead.
+ */
+ public function testAssertInternalType() {
+ $this->assertInternalType('string', 'string');
+ }
+
+ /**
+ * @expectedDeprecation assertAttributeEquals() is deprecated and will be removed in PHPUnit 9.
+ * @expectedDeprecation readAttribute() is deprecated and will be removed in PHPUnit 9.
+ * @expectedDeprecation getObjectAttribute() is deprecated and will be removed in PHPUnit 9.
+ * @expectedDeprecation assertAttributeSame() is deprecated and will be removed in PHPUnit 9.
+ * @expectedDeprecation assertAttributeInstanceOf() is deprecated and will be removed in PHPUnit 9.
+ * @expectedDeprecation assertAttributeEmpty() is deprecated and will be removed in PHPUnit 9.
+ */
+ public function testAssertAttribute() {
+ $obj = new class() {
+ protected $attribute = 'value';
+ protected $class;
+ protected $empty;
+
+ public function __construct() {
+ $this->class = new \stdClass();
+ }
+
+ };
+ $this->assertAttributeEquals('value', 'attribute', $obj);
+ $this->assertAttributeSame('value', 'attribute', $obj);
+ $this->assertAttributeInstanceOf(\stdClass::class, 'class', $obj);
+ $this->assertAttributeEmpty('empty', $obj);
+ }
+
+ /**
+ * @expectedDeprecation The optional $canonicalize parameter of assertEquals() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertEqualsCanonicalizing() instead.
+ */
+ public function testAssertEquals() {
+ $this->assertEquals(['a', 'b'], ['b', 'a'], '', 0.0, 10, TRUE);
+ }
+
+ /**
+ * @expectedDeprecation expectExceptionMessageRegExp() is deprecated in PHPUnit 8 and will be removed in PHPUnit 9.
+ */
+ public function testExpectExceptionMessageRegExp() {
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessageRegExp('/An exception .*/');
+ throw new \Exception('An exception has been triggered');
+ }
+
+}
diff --git a/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php b/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
deleted file mode 100644
index 5b80264681a48e77098ea3b1aacef02c188d6f90..0000000000000000000000000000000000000000
--- a/core/tests/Drupal/Tests/Traits/PHPUnit8Warnings.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\Tests\Traits;
-
-/**
- * Used to ignore warnings being added by PHPUnit 8.
- *
- * This trait exists to allow Drupal 8 tests using PHPUnit 7 and Drupal 9 tests
- * using PHPUnit 8 to happily co-exist. Once Drupal 8 and Drupal 9 are not so
- * closely aligned these will be fixed in core and the warnings will be emitted
- * from the test runner.
- *
- * @todo https://www.drupal.org/project/drupal/issues/3110543 Remove the ignored
- * warnings to support PHPUnit 9.
- *
- * @internal
- */
-trait PHPUnit8Warnings {
-
- /**
- * The list of warnings to ignore.
- *
- * @var string[]
- */
- private static $ignoredWarnings = [
- 'expectExceptionMessageRegExp() is deprecated in PHPUnit 8 and will be removed in PHPUnit 9.',
- ];
-
- /**
- * Ignores specific PHPUnit 8 warnings.
- *
- * @see \PHPUnit\Framework\TestCase::addWarning()
- *
- * @internal
- */
- public function addWarning(string $warning): void {
- if (in_array($warning, self::$ignoredWarnings, TRUE)) {
- return;
- }
- parent::addWarning($warning);
- }
-
-}
diff --git a/core/tests/Drupal/Tests/Traits/PhpUnitWarnings.php b/core/tests/Drupal/Tests/Traits/PhpUnitWarnings.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2e3039d208ea9b8b8995358df241f49675f1a02
--- /dev/null
+++ b/core/tests/Drupal/Tests/Traits/PhpUnitWarnings.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\Traits;
+
+/**
+ * Converts deprecation warnings added by PHPUnit to silenced deprecations.
+ *
+ * This trait exists to allow Drupal to run tests with multiple versions of
+ * PHPUnit without failing due to PHPUnit's deprecation warnings.
+ *
+ * @internal
+ */
+trait PhpUnitWarnings {
+
+ /**
+ * Deprecation warnings from PHPUnit to raise with @trigger_error().
+ *
+ * Add any PHPUnit deprecations that should be handled as deprecation warnings
+ * (rather than unconditional failures) for core and contrib.
+ *
+ * @var string[]
+ */
+ private static $deprecationWarnings = [
+ 'Using assertContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringContainsString() or assertStringContainsStringIgnoringCase() instead.',
+ 'Using assertNotContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. Refactor your test to use assertStringNotContainsString() or assertStringNotContainsStringIgnoringCase() instead.',
+ 'assertArraySubset() is deprecated and will be removed in PHPUnit 9.',
+ 'assertInternalType() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertIsArray(), assertIsBool(), assertIsFloat(), assertIsInt(), assertIsNumeric(), assertIsObject(), assertIsResource(), assertIsString(), assertIsScalar(), assertIsCallable(), or assertIsIterable() instead.',
+ 'readAttribute() is deprecated and will be removed in PHPUnit 9.',
+ 'getObjectAttribute() is deprecated and will be removed in PHPUnit 9.',
+ 'The optional $canonicalize parameter of assertEquals() is deprecated and will be removed in PHPUnit 9. Refactor your test to use assertEqualsCanonicalizing() instead.',
+ 'assertAttributeEquals() is deprecated and will be removed in PHPUnit 9.',
+ 'assertAttributeSame() is deprecated and will be removed in PHPUnit 9.',
+ 'assertAttributeInstanceOf() is deprecated and will be removed in PHPUnit 9.',
+ 'assertAttributeEmpty() is deprecated and will be removed in PHPUnit 9.',
+ 'The optional $ignoreCase parameter of assertContains() is deprecated and will be removed in PHPUnit 9.',
+ 'The optional $ignoreCase parameter of assertNotContains() is deprecated and will be removed in PHPUnit 9.',
+ 'expectExceptionMessageRegExp() is deprecated in PHPUnit 8 and will be removed in PHPUnit 9.',
+ // Warning for testing.
+ 'Test warning for \Drupal\Tests\PhpUnitWarningsTest::testAddWarning()',
+ ];
+
+ /**
+ * Converts PHPUnit deprecation warnings to E_USER_DEPRECATED.
+ *
+ * @param string $warning
+ * The warning message raised in tests.
+ *
+ * @see \PHPUnit\Framework\TestCase::addWarning()
+ *
+ * @internal
+ */
+ public function addWarning(string $warning): void {
+ if (in_array($warning, self::$deprecationWarnings, TRUE)) {
+ // Convert listed PHPUnit deprecations into E_USER_DEPRECATED and prevent
+ // each from being raised as a test warning.
+ @trigger_error($warning, E_USER_DEPRECATED);
+ return;
+ }
+
+ // Otherwise, let the parent raise any warning not specifically listed.
+ parent::addWarning($warning);
+ }
+
+}
diff --git a/core/tests/Drupal/Tests/UiHelperTrait.php b/core/tests/Drupal/Tests/UiHelperTrait.php
index faf487c8ca4b3e107e38de516dc284a2e51bc889..ae20321026dcca7b478a8c6b2a2157c9edaf13d7 100644
--- a/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/core/tests/Drupal/Tests/UiHelperTrait.php
@@ -163,8 +163,6 @@ protected function submitForm(array $edit, $submit, $form_html_id = NULL) {
* $edit = array();
* $edit['name[]'] = array('value1', 'value2');
* @endcode
- * @todo change $edit to disallow NULL as a value for Drupal 9.
- * https://www.drupal.org/node/2802401
* @param string $submit
* The id, name, label or value of the submit button which is to be clicked.
* For example, 'Save'. The first element matched by
@@ -201,6 +199,7 @@ protected function drupalPostForm($path, $edit, $submit, array $options = [], $f
$submit = (string) $submit;
}
if ($edit === NULL) {
+ @trigger_error('Calling ' . __METHOD__ . '() with $edit set to NULL is deprecated in drupal:9.1.0 and the method is removed in drupal:10.0.0. Use $this->submitForm() instead. See https://www.drupal.org/node/3168858', E_USER_DEPRECATED);
$edit = [];
}
diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php
index 2c2257b2dabe19c2be097db7feb63e6b90a968ae..3a4e035ce06082031a41b5c8ae382da12c9241cc 100644
--- a/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/core/tests/Drupal/Tests/UnitTestCase.php
@@ -9,7 +9,7 @@
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
-use Drupal\Tests\Traits\PHPUnit8Warnings;
+use Drupal\Tests\Traits\PhpUnitWarnings;
use PHPUnit\Framework\TestCase;
/**
@@ -19,7 +19,7 @@
*/
abstract class UnitTestCase extends TestCase {
- use PHPUnit8Warnings;
+ use PhpUnitWarnings;
/**
* The random generator.
@@ -87,8 +87,14 @@ protected function getRandomGenerator() {
* @param array $expected
* @param array $actual
* @param string $message
+ *
+ * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use
+ * ::assertEquals, ::assertEqualsCanonicalizing, or ::assertSame instead.
+ *
+ * @see https://www.drupal.org/node/3136304
*/
protected function assertArrayEquals(array $expected, array $actual, $message = NULL) {
+ @trigger_error(__METHOD__ . "() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use ::assertEquals(), ::assertEqualsCanonicalizing(), or ::assertSame() instead. See https://www.drupal.org/node/3136304", E_USER_DEPRECATED);
ksort($expected);
ksort($actual);
$this->assertEquals($expected, $actual, !empty($message) ? $message : '');
diff --git a/core/tests/Drupal/Tests/UnitTestCaseTest.php b/core/tests/Drupal/Tests/UnitTestCaseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d01264de6616ad2bc437c58468000f9c821f9cdd
--- /dev/null
+++ b/core/tests/Drupal/Tests/UnitTestCaseTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\Tests;
+
+/**
+ * Tests for the UnitTestCase class.
+ *
+ * @group Tests
+ */
+class UnitTestCaseTest extends UnitTestCase {
+
+ /**
+ * Tests deprecation of the ::assertArrayEquals method.
+ *
+ * @group legacy
+ * @expectedDeprecation Drupal\Tests\UnitTestCase::assertArrayEquals() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use ::assertEquals(), ::assertEqualsCanonicalizing(), or ::assertSame() instead. See https://www.drupal.org/node/3136304
+ */
+ public function testAssertArrayEquals() {
+ $this->assertArrayEquals([], []);
+ }
+
+}
diff --git a/core/themes/claro/claro.info.yml b/core/themes/claro/claro.info.yml
index 99397ee0fc105be0e8c817a03ef00850cf08b174..44049c582a27741ecaf160ad9f33ea7a3571bd2e 100644
--- a/core/themes/claro/claro.info.yml
+++ b/core/themes/claro/claro.info.yml
@@ -19,9 +19,9 @@ package: Core
version: VERSION
experimental: true
libraries:
- - core/drupal.message
- - core/normalize
- - claro/global-styling
+ - core/drupal.message
+ - core/normalize
+ - claro/global-styling
libraries-override:
system/base:
css:
@@ -69,7 +69,10 @@ libraries-override:
component:
assets/vendor/jquery.ui/themes/base/dialog.css: false
- user/drupal.user: claro/form.password-confirm
+ user/drupal.user:
+ css:
+ component:
+ css/user.module.css: false
field_ui/drupal.field_ui:
css:
@@ -118,6 +121,8 @@ libraries-extend:
- claro/drupal.shortcut
core/drupal.ajax:
- claro/ajax
+ user/drupal.user:
+ - claro/form.password-confirm
views/views.module:
- claro/views
media/media_embed_ckeditor_theme:
diff --git a/core/themes/claro/claro.libraries.yml b/core/themes/claro/claro.libraries.yml
index d4fbca84199c1674e7ada2358e112fbe6d81c81c..02ed758bc1c5260c98d46bf4a4f6059de8ad0f25 100644
--- a/core/themes/claro/claro.libraries.yml
+++ b/core/themes/claro/claro.libraries.yml
@@ -219,11 +219,10 @@ form.password-confirm:
component:
css/components/form--password-confirm.css: {}
js:
- js/user.js: {}
+ js/user.theme.js: {}
dependencies:
- - core/jquery
+ - core/drupal.object.assign
- core/drupal
- - core/jquery.once
- claro/global-styling
views:
diff --git a/core/themes/claro/css/base/elements.css b/core/themes/claro/css/base/elements.css
index 899971f078e710d418cf36fdb228066ad743516c..345ffc387d56500b06b17c84575601b6f699fc44 100644
--- a/core/themes/claro/css/base/elements.css
+++ b/core/themes/claro/css/base/elements.css
@@ -10,23 +10,7 @@
*/
html {
- font-family: BlinkMacSystemFont
-,
--apple-system
-,
-"Segoe UI"
-,
-Roboto
-,
-Oxygen-Sans
-,
-Ubuntu
-,
-Cantarell
-,
-"Helvetica Neue"
-,
-sans-serif;
+ font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-size: 100%;
font-weight: normal;
font-style: normal;
@@ -266,18 +250,6 @@ img {
.page-wrapper *:focus,
.ui-dialog *:focus {
- outline: 2px
-dotted
-transparent;
- box-shadow: 0
-0
-0
-2px
-#fff
-,
-0
-0
-0
-5px
-#26a769;
+ outline: 2px dotted transparent;
+ box-shadow: 0 0 0 2px #fff, 0 0 0 5px #26a769;
}
diff --git a/core/themes/claro/css/components/accordion.css b/core/themes/claro/css/components/accordion.css
index 83b83d090b1a8129549168555b13121330b4c154..5446d79ea8ecfb26946b865460f98ab8592e50b5 100644
--- a/core/themes/claro/css/components/accordion.css
+++ b/core/themes/claro/css/components/accordion.css
@@ -15,10 +15,7 @@
border: 1px solid rgba(216, 217, 224, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.accordion__item {
diff --git a/core/themes/claro/css/components/card.css b/core/themes/claro/css/components/card.css
index e4a0725baf4cda8fff46a761a2e562ebc0c751cf..5508a913ae5c1d1b9834aaecd2d7c60b9949c885 100644
--- a/core/themes/claro/css/components/card.css
+++ b/core/themes/claro/css/components/card.css
@@ -19,10 +19,7 @@
border: 1px solid rgba(212, 212, 218, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-4px
-10px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
}
/* 588px theme screenshot width */
diff --git a/core/themes/claro/css/components/details.css b/core/themes/claro/css/components/details.css
index d3938d2c6fe179c5b3f9b8118ab1bc5f766f01c8..a078e3ada9209a2174918adf3319836419943aa4 100644
--- a/core/themes/claro/css/components/details.css
+++ b/core/themes/claro/css/components/details.css
@@ -43,10 +43,7 @@
border: 1px solid rgba(216, 217, 224, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.claro-details--accordion-item,
@@ -149,7 +146,7 @@ rgba(0, 0, 0, 0.1);
margin-top: -0.5rem;
content: "";
transition: transform 0.12s ease-in 0s;
- transform: rotate(0); /* LTR */
+ transform: rotate(90deg); /* LTR */
text-align: center;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath d='M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z' fill='%23545560'/%3e%3c/svg%3e");
background-size: contain;
@@ -158,7 +155,7 @@ rgba(0, 0, 0, 0.1);
[dir="rtl"] .claro-details__summary::before {
right: 0.75rem;
left: auto;
- transform: rotate(180deg);
+ transform: rotate(-270deg);
}
@media (prefers-reduced-motion: reduce) {
@@ -171,16 +168,16 @@ rgba(0, 0, 0, 0.1);
.claro-details__summary::before {
width: 0.5625rem;
height: 0.5625rem;
- margin-top: -0.28125rem;
transition: transform 0.12s ease-in 0s, margin 0.12s ease-in 0s;
- transform: rotate(45deg); /* LTR */
+ transform: rotate(135deg); /* LTR */
border: 0.125rem solid;
- border-width: 0.125rem 0.125rem 0 0;
+ border-bottom-color: transparent;
+ border-left-color: transparent;
background: none;
}
[dir="rtl"] .claro-details__summary::before {
- transform: rotate(225deg);
+ transform: rotate(-225deg);
}
}
@@ -204,7 +201,7 @@ rgba(0, 0, 0, 0.1);
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.claro-details__summary::before {
transition: none;
}
@@ -286,7 +283,7 @@ rgba(0, 0, 0, 0.1);
}
.claro-details[open] > .claro-details__summary::before {
- transform: rotate(90deg); /* for LTR and RTL */
+ transform: rotate(-90deg); /* for LTR and RTL */
}
@media screen and (-ms-high-contrast: active) {
@@ -297,9 +294,9 @@ rgba(0, 0, 0, 0.1);
.claro-details[open] > .claro-details__summary::before,
[dir="rtl"] .claro-details[open] > .claro-details__summary::before {
- margin-top: -0.40625rem;
+ margin-top: -0.0625rem;
margin-right: 0.125rem;
- transform: rotate(135deg); /* for LTR and RTL */
+ transform: rotate(-45deg); /* for LTR and RTL */
background: none;
}
}
@@ -358,7 +355,7 @@ rgba(0, 0, 0, 0.1);
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.claro-details__summary::after {
transition: none;
}
diff --git a/core/themes/claro/css/components/details.pcss.css b/core/themes/claro/css/components/details.pcss.css
index 987cf064728df0ed3c9c8c06ea9bd5ef2da4c0be..b9f8452bf1d26f7890cc44ecf686a59568bac3e1 100644
--- a/core/themes/claro/css/components/details.pcss.css
+++ b/core/themes/claro/css/components/details.pcss.css
@@ -140,7 +140,7 @@
margin-top: calc(var(--space-m) / -2);
content: "";
transition: transform var(--details-transform-transition-duration) ease-in 0s;
- transform: rotate(0); /* LTR */
+ transform: rotate(90deg); /* LTR */
text-align: center;
background-image: url(../../images/icons/545560/chevron-right.svg);
background-size: contain;
@@ -148,7 +148,7 @@
[dir="rtl"] .claro-details__summary::before {
right: var(--space-s);
left: auto;
- transform: rotate(180deg);
+ transform: rotate(-270deg);
}
@media (prefers-reduced-motion: reduce) {
@@ -161,16 +161,16 @@
.claro-details__summary::before {
width: 0.5625rem;
height: 0.5625rem;
- margin-top: calc(0.5625rem / -2);
transition: transform var(--details-transform-transition-duration) ease-in 0s, margin var(--details-transform-transition-duration) ease-in 0s;
- transform: rotate(45deg); /* LTR */
+ transform: rotate(135deg); /* LTR */
border: 0.125rem solid;
- border-width: 0.125rem 0.125rem 0 0;
+ border-bottom-color: transparent;
+ border-left-color: transparent;
background: none;
}
[dir="rtl"] .claro-details__summary::before {
- transform: rotate(225deg);
+ transform: rotate(-225deg);
}
}
@@ -192,7 +192,7 @@
*/
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.claro-details__summary::before {
transition: none;
}
@@ -271,7 +271,7 @@
}
.claro-details[open] > .claro-details__summary::before {
- transform: rotate(90deg); /* for LTR and RTL */
+ transform: rotate(-90deg); /* for LTR and RTL */
}
@media screen and (-ms-high-contrast: active) {
@@ -282,9 +282,9 @@
.claro-details[open] > .claro-details__summary::before,
[dir="rtl"] .claro-details[open] > .claro-details__summary::before {
- margin-top: calc((0.5625rem / -2) - 0.125rem);
+ margin-top: calc(0.125rem / -2);
margin-right: 0.125rem;
- transform: rotate(135deg); /* for LTR and RTL */
+ transform: rotate(-45deg); /* for LTR and RTL */
background: none;
}
}
@@ -339,7 +339,7 @@
*/
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.claro-details__summary::after {
transition: none;
}
diff --git a/core/themes/claro/css/components/dialog.css b/core/themes/claro/css/components/dialog.css
index e93d59e3cc616d35b226608782e5617f8e9d1018..48e9358cc6fb8173aebeb1e39024329afb5c3e1a 100644
--- a/core/themes/claro/css/components/dialog.css
+++ b/core/themes/claro/css/components/dialog.css
@@ -15,22 +15,12 @@
border: 0;
border-radius: 4px;
background: transparent;
- box-shadow: 0
-0
-1rem
--0.25rem
-#222330;
+ box-shadow: 0 0 1rem -0.25rem #222330;
}
.ui-dialog:focus {
- outline: 2px
-dotted
-transparent;
- box-shadow: 0
-0
-0
-3px
-#26a769;
+ outline: 2px dotted transparent;
+ box-shadow: 0 0 0 3px #26a769;
}
@media all and (max-width: 48em) { /* 768px */
@@ -89,9 +79,7 @@ transparent;
.ui-dialog .ui-dialog-titlebar-close:focus {
border-color: #26a769;
- outline: 2px
-dotted
-transparent;
+ outline: 2px dotted transparent;
box-shadow: none;
}
diff --git a/core/themes/claro/css/components/fieldset.css b/core/themes/claro/css/components/fieldset.css
index fffbfc5a2dbe86ab6296e9413b130bb1951fe07b..99532d3592646ae2bd85e6ea9d24922560cc93b6 100644
--- a/core/themes/claro/css/components/fieldset.css
+++ b/core/themes/claro/css/components/fieldset.css
@@ -18,10 +18,7 @@
border: 1px solid rgba(216, 217, 224, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.fieldset--group {
diff --git a/core/themes/claro/css/components/form--password-confirm.css b/core/themes/claro/css/components/form--password-confirm.css
index 0bc31cabb355126316cb684bc91c967c8eb4bcf9..3a4e2bcf2f1dec65b4c4638dc276ee2da1d67b1c 100644
--- a/core/themes/claro/css/components/form--password-confirm.css
+++ b/core/themes/claro/css/components/form--password-confirm.css
@@ -86,9 +86,7 @@
min-width: calc(0.5rem - 2px);
height: calc(0.5rem - 2px);
margin: -1px;
- transition: width
-0.5s
-ease-out;
+ transition: width 0.5s ease-out;
border: 1px solid transparent;
border-radius: 0.5rem;
background-color: transparent;
@@ -189,10 +187,7 @@ ease-out;
border: 1px solid #d4d4d8;
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
font-size: 0.79rem;
}
diff --git a/core/themes/claro/css/components/form.css b/core/themes/claro/css/components/form.css
index c99c8b46737f00f968bf13c8db5c8ec9af961028..e1ffb0b7498cc7d602cd145e19e8dfd134cf1056 100644
--- a/core/themes/claro/css/components/form.css
+++ b/core/themes/claro/css/components/form.css
@@ -168,6 +168,7 @@ tr .form-item,
}
.form-actions .ajax-progress--throbber {
+ -ms-grid-row-align: center;
align-self: center;
}
diff --git a/core/themes/claro/css/components/progress.css b/core/themes/claro/css/components/progress.css
index efdf4defe4f92b2d3c9057f5e9a6e298eb4d2816..38106bf38081dacb1eed7c480992fc45e488b9d0 100644
--- a/core/themes/claro/css/components/progress.css
+++ b/core/themes/claro/css/components/progress.css
@@ -46,9 +46,7 @@
height: calc(1rem - 2px);
margin-top: -1px;
margin-left: -1px; /* LTR */
- transition: width
-0.5s
-ease-out;
+ transition: width 0.5s ease-out;
border: 1px #003cc5 solid;
border-radius: 1rem;
background-color: #003cc5;
diff --git a/core/themes/claro/css/components/shortcut.css b/core/themes/claro/css/components/shortcut.css
index 9974b9dc0a4deaadd1e6d5378f8f3ed575c1f303..7333d1779918479388387a595e7b03e7a85d9d40 100644
--- a/core/themes/claro/css/components/shortcut.css
+++ b/core/themes/claro/css/components/shortcut.css
@@ -32,11 +32,8 @@
.shortcut-action__message {
display: inline-block;
margin-left: 0.75rem; /* LTR */
- padding: 0.25rem
-1rem;
- transition: all
-0.2s
-ease-out;
+ padding: 0.25rem 1rem;
+ transition: all 0.2s ease-out;
transform: translateY(-0.5rem);
vertical-align: top;
opacity: 0;
diff --git a/core/themes/claro/css/components/system-admin--links.css b/core/themes/claro/css/components/system-admin--links.css
index 6053a84519568e0bb36a65183a44ec74d5d60057..66876df4eb48a55ec17fe7e50cc91aba2376b67a 100644
--- a/core/themes/claro/css/components/system-admin--links.css
+++ b/core/themes/claro/css/components/system-admin--links.css
@@ -35,6 +35,5 @@ small .admin-link:after {
*/
.system-cron-settings__link {
- overflow-wrap: break-word;
word-wrap: break-word;
}
diff --git a/core/themes/claro/css/components/system-admin--links.pcss.css b/core/themes/claro/css/components/system-admin--links.pcss.css
index 5665f691aed4b040e35ddbba8391ff0df2ebb96a..3e80a5ec038d8ca42e6f131934df2f03e499a5f2 100644
--- a/core/themes/claro/css/components/system-admin--links.pcss.css
+++ b/core/themes/claro/css/components/system-admin--links.pcss.css
@@ -25,5 +25,4 @@ small .admin-link:after {
*/
.system-cron-settings__link {
overflow-wrap: break-word;
- word-wrap: break-word;
}
diff --git a/core/themes/claro/css/components/tabledrag.css b/core/themes/claro/css/components/tabledrag.css
index 32f98408ea931a9396ac47be34776ed801e47806..f83d21132f76f94e830b93d68a412f4a6747a1c9 100644
--- a/core/themes/claro/css/components/tabledrag.css
+++ b/core/themes/claro/css/components/tabledrag.css
@@ -275,7 +275,7 @@ body.drag {
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.tabledrag-cell-content .tree {
overflow: visible;
min-height: 0;
diff --git a/core/themes/claro/css/components/tabledrag.pcss.css b/core/themes/claro/css/components/tabledrag.pcss.css
index 5e42094d0a7efccf0a564a38f5a12bb5b719e50f..3c73ffbf4ba2d158e61635ea5bf2d4ca1c17aee5 100644
--- a/core/themes/claro/css/components/tabledrag.pcss.css
+++ b/core/themes/claro/css/components/tabledrag.pcss.css
@@ -245,7 +245,7 @@ body.drag {
*/
/* stylelint-disable-next-line unit-whitelist */
@media not all and (min-resolution: 0.001dpcm) {
- @media {
+ @supports (-webkit-appearance: none) {
.tabledrag-cell-content .tree {
overflow: visible;
min-height: 0;
diff --git a/core/themes/claro/css/components/tabs.css b/core/themes/claro/css/components/tabs.css
index 30dac3da5299b028dfa697666e4c5f399a1d0ad9..8dc882468119cd4bd26922907b41cb1e285904dd 100644
--- a/core/themes/claro/css/components/tabs.css
+++ b/core/themes/claro/css/components/tabs.css
@@ -24,14 +24,9 @@
flex-direction: column;
width: 100%;
margin: 0 0 1.5rem 0;
- border: 1px
-solid
-#d4d4d8;
+ border: 1px solid #d4d4d8;
border-radius: 2px;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
[dir="rtl"] .tabs {
@@ -40,9 +35,7 @@ rgba(0, 0, 0, 0.1);
.tabs__tab {
position: relative;
- border-bottom: 1px
-solid
-#d4d4d8;
+ border-bottom: 1px solid #d4d4d8;
background-color: #fafbfd;
font-size: 0.889rem;
font-weight: bold;
@@ -56,10 +49,7 @@ solid
display: flex;
justify-content: space-between;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.tabs__link {
@@ -185,15 +175,11 @@ rgba(0, 0, 0, 0.1);
width: 3rem;
padding-right: 1px;
text-align: center;
- border-left: 1px
-solid
-rgba(216, 217, 224, 0.8); /* LTR */
+ border-left: 1px solid rgba(216, 217, 224, 0.8); /* LTR */
}
[dir="rtl"] .tabs__trigger {
- border-right: 1px
-solid
-rgba(216, 217, 224, 0.8);
+ border-right: 1px solid rgba(216, 217, 224, 0.8);
border-left: none;
}
diff --git a/core/themes/claro/css/components/vertical-tabs.css b/core/themes/claro/css/components/vertical-tabs.css
index be93482645c42874ab13232376737fe34d07afa2..6cd8d3a600202a6d2b642b68a67ceedfd2930527 100644
--- a/core/themes/claro/css/components/vertical-tabs.css
+++ b/core/themes/claro/css/components/vertical-tabs.css
@@ -216,10 +216,7 @@
color: #003cc5;
border-color: rgba(216, 217, 224, 0.8) transparent;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.vertical-tabs__menu-item.is-selected .vertical-tabs__menu-link:hover {
@@ -282,15 +279,10 @@ rgba(0, 0, 0, 0.1);
margin-top: 0.75rem;
margin-bottom: 0.75rem;
color: #222330;
- border: 1px
-solid
-rgba(216, 217, 224, 0.8);
+ border: 1px solid rgba(216, 217, 224, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
/* This modifier is added by JavaScript (this is inherited from Drupal core). */
diff --git a/core/themes/claro/css/components/views-exposed-form.css b/core/themes/claro/css/components/views-exposed-form.css
index 9a47ec1a4f513fc8e8095a8ffe387050a10ac5a1..db206efb918af07c07b777f2b4ac723c8865eb2d 100644
--- a/core/themes/claro/css/components/views-exposed-form.css
+++ b/core/themes/claro/css/components/views-exposed-form.css
@@ -34,10 +34,7 @@
border: 1px solid rgba(216, 217, 224, 0.8);
border-radius: 2px;
background-color: #fff;
- box-shadow: 0
-2px
-4px
-rgba(0, 0, 0, 0.1);
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.views-exposed-form__item.views-exposed-form__item {
diff --git a/core/themes/claro/css/components/views-ui.css b/core/themes/claro/css/components/views-ui.css
index 99927c4819a6ff878c633d2a49fdb10fc91ef5d4..b0feba0d5cd329ea41d6078b180a7347bad4de6c 100644
--- a/core/themes/claro/css/components/views-ui.css
+++ b/core/themes/claro/css/components/views-ui.css
@@ -431,6 +431,7 @@ details.fieldset-no-legend {
}
[dir="rtl"] .views-ui-rearrange-filter-form tr td:last-child {
+ border-right: 0;
border-right: initial;
border-left: medium none;
}
@@ -471,6 +472,7 @@ details.fieldset-no-legend {
}
[dir="rtl"] .views-query-info table tr td:last-child {
+ border-right: 0;
border-right: initial;
border-left: 0 none;
}
diff --git a/core/themes/claro/css/theme/ckeditor-dialog.css b/core/themes/claro/css/theme/ckeditor-dialog.css
index 2564bcdff0f2f3b85d435de1803538787adccb34..0562017a9ad8d985a5318ef441e02f65a0f8ba66 100644
--- a/core/themes/claro/css/theme/ckeditor-dialog.css
+++ b/core/themes/claro/css/theme/ckeditor-dialog.css
@@ -38,7 +38,7 @@
}
.cke_reset_all .cke_dialog_body * {
- font: 13px/1.538em BlinkMacSystemFont , -apple-system , "Segoe UI" , Roboto , Oxygen-Sans , Ubuntu , Cantarell , "Helvetica Neue" , sans-serif;
+ font: 13px/1.538em BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
}
/* Dialog's header. */
diff --git a/core/themes/claro/css/theme/ckeditor-editor.css b/core/themes/claro/css/theme/ckeditor-editor.css
index c2c273ad4bb4d4481d6d19bc8d9ec54ab2605f1f..bb3dc4abe8541e6265159207bb1d6df93c0973db 100644
--- a/core/themes/claro/css/theme/ckeditor-editor.css
+++ b/core/themes/claro/css/theme/ckeditor-editor.css
@@ -56,20 +56,8 @@
}
/* Focus. */
.cke.cke_chrome.cke_focus {
- outline: 2px
-dotted
-transparent;
- box-shadow: 0
-0
-0
-2px
-#fff
-,
-0
-0
-0
-5px
-#26a769;
+ outline: 2px dotted transparent;
+ box-shadow: 0 0 0 2px #fff, 0 0 0 5px #26a769;
}
/* Error. */
.error + .cke.cke_chrome,
diff --git a/core/themes/claro/css/theme/media-library.css b/core/themes/claro/css/theme/media-library.css
index 4724c8473e2e0c8a0da94a2ed2732e1c844e24ab..b74f13a342e698014f9496458b5ed8213d750e5b 100644
--- a/core/themes/claro/css/theme/media-library.css
+++ b/core/themes/claro/css/theme/media-library.css
@@ -161,6 +161,7 @@
*/
.button.media-library-add-form-oembed-submit {
+ -ms-grid-row-align: center;
align-self: center;
}
diff --git a/core/themes/claro/js/user.es6.js b/core/themes/claro/js/user.es6.js
deleted file mode 100644
index 2349216d356c5220351f3019660a294ee09c562c..0000000000000000000000000000000000000000
--- a/core/themes/claro/js/user.es6.js
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * @file
- * Overrides Drupal core user.js that provides password strength indicator.
- *
- * @todo remove these overrides after
- * https://www.drupal.org/project/drupal/issues/3067523 has been resolved.
- */
-
-(($, Drupal) => {
- /**
- * This overrides the default Drupal.behaviors.password functionality.
- *
- * - Markup has been moved to theme functions so that to enable customizations
- * needed for matching Claro's design requirements
- * (https://www.drupal.org/project/drupal/issues/3067523).
- * - Modified classes so that same class names are not being used for different
- * elements (https://www.drupal.org/project/drupal/issues/3061265).
- */
- Drupal.behaviors.password = {
- attach(context, settings) {
- const $passwordInput = $(context)
- .find('input.js-password-field')
- .once('password');
-
- if ($passwordInput.length) {
- // Settings and translated messages added by
- // user_form_process_password_confirm().
- const translate = settings.password;
-
- // The form element object of the password input.
- const $passwordInputParent = $passwordInput.parent();
-
- // The password_confirm form element object.
- const $passwordWidget = $passwordInput.closest(
- '.js-form-type-password-confirm',
- );
-
- // The password confirm input.
- const $passwordConfirmInput = $passwordWidget.find(
- 'input.js-password-confirm',
- );
-
- // The strength feedback element for the password input.
- const $passwordInputHelp = $(
- Drupal.theme.passwordInputHelp(translate.strengthTitle),
- );
-
- // The password match feedback for the password confirm input.
- const $passwordConfirmHelp = $(
- Drupal.theme.passwordConfirmHelp(translate.confirmTitle),
- );
-
- const $passwordInputStrengthBar = $passwordInputHelp.find(
- '.js-password-strength-bar',
- );
- const $passwordInputStrengthMessageWrapper = $passwordInputHelp.find(
- '.js-password-strength-text',
- );
- const $passwordConfirmMatch = $passwordConfirmHelp.find(
- '.js-password-match-text',
- );
- let $passwordSuggestionsTips = $(
- Drupal.theme.passwordSuggestionsTips('', ''),
- ).hide();
-
- // If the password strength indicator is enabled, add its markup.
- if (settings.password.showStrengthIndicator) {
- $passwordConfirmInput
- .after($passwordConfirmHelp)
- .parent()
- .after($passwordSuggestionsTips);
-
- $passwordInputParent.append($passwordInputHelp);
- }
-
- // Check that password and confirmation inputs match.
- const passwordCheckMatch = confirmInputVal => {
- if (confirmInputVal) {
- const success = $passwordInput.val() === confirmInputVal;
- const confirmClass = success ? 'ok' : 'error';
- const confirmMatchMessage = success
- ? translate.confirmSuccess
- : translate.confirmFailure;
-
- // Update the success message and set the class accordingly if
- // needed.
- if (
- !$passwordConfirmMatch.hasClass(confirmClass) ||
- !$passwordConfirmMatch.html() === confirmMatchMessage
- ) {
- $passwordConfirmMatch
- .html(confirmMatchMessage)
- .removeClass('ok error')
- .addClass(confirmClass);
- }
- }
- };
-
- // Check the password strength.
- const passwordCheck = () => {
- if (settings.password.showStrengthIndicator) {
- // Evaluate the password strength.
- const result = Drupal.evaluatePasswordStrength(
- $passwordInput.val(),
- settings.password,
- );
- const $newSuggestions = $(
- Drupal.theme.passwordSuggestionsTips(
- translate.hasWeaknesses,
- result.tips,
- ),
- );
-
- // Update the suggestions for how to improve the password.
- if ($newSuggestions.html() !== $passwordSuggestionsTips.html()) {
- $passwordSuggestionsTips.replaceWith($newSuggestions);
- $passwordSuggestionsTips = $newSuggestions;
-
- // Only show the description box if a weakness exists in the
- // password.
- $passwordSuggestionsTips.toggle(result.strength !== 100);
- }
-
- // Adjust the length of the strength indicator.
- $passwordInputStrengthBar
- .css('width', `${result.strength}%`)
- .removeClass('is-weak is-fair is-good is-strong')
- .addClass(result.indicatorClass);
-
- // Update the strength indication text if needed.
- if (
- !$passwordInputStrengthMessageWrapper.hasClass(
- result.indicatorClass,
- ) ||
- !$passwordInputStrengthMessageWrapper.html() ===
- result.indicatorText
- ) {
- $passwordInputStrengthMessageWrapper
- .html(result.indicatorText)
- .removeClass('is-weak is-fair is-good is-strong')
- .addClass(result.indicatorClass);
- }
- }
-
- $passwordWidget
- .removeClass('is-initial')
- .removeClass('is-password-empty is-password-filled')
- .removeClass('is-confirm-empty is-confirm-filled');
-
- // Check the value of the password input and add the proper classes.
- $passwordWidget.addClass(
- $passwordInput.val() ? 'is-password-filled' : 'is-password-empty',
- );
-
- // Check the value in the confirm input and show results.
- passwordCheckMatch($passwordConfirmInput.val());
- $passwordWidget.addClass(
- $passwordConfirmInput.val()
- ? 'is-confirm-filled'
- : 'is-confirm-empty',
- );
- };
-
- // Add initial classes.
- $passwordWidget
- .addClass(
- $passwordInput.val() ? 'is-password-filled' : 'is-password-empty',
- )
- .addClass(
- $passwordConfirmInput.val()
- ? 'is-confirm-filled'
- : 'is-confirm-empty',
- );
-
- // Monitor input events.
- $passwordInput.on('input', passwordCheck);
- $passwordConfirmInput.on('input', passwordCheck);
- }
- },
- };
-
- /**
- * Override the default Drupal.evaluatePasswordStrength.
- *
- * The default implementation of this function hard codes some markup inside
- * this function. Rendering markup is now handled by
- * Drupal.behaviors.password.
- *
- * @param {string} password
- * Password to evaluate the strength.
- *
- * @param {Array.<string>} translate
- * Settings and translated messages added by user_form_process_password_confirm().
- *
- * @return {Array.<string>}
- * Array containing the strength, tips, indicators text and class.
- */
- Drupal.evaluatePasswordStrength = (password, translate) => {
- password = password.trim();
- let indicatorText;
- let indicatorClass;
- let weaknesses = 0;
- let strength = 100;
- const tips = [];
- const hasLowercase = /[a-z]/.test(password);
- const hasUppercase = /[A-Z]/.test(password);
- const hasNumbers = /[0-9]/.test(password);
- const hasPunctuation = /[^a-zA-Z0-9]/.test(password);
-
- // If there is a username edit box on the page, compare password to that,
- // otherwise use value from the database.
- const $usernameBox = $('input.username');
- const username =
- $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
-
- // Lose 5 points for every character less than 12, plus a 30 point penalty.
- if (password.length < 12) {
- tips.push(translate.tooShort);
- strength -= (12 - password.length) * 5 + 30;
- }
-
- // Count weaknesses.
- if (!hasLowercase) {
- tips.push(translate.addLowerCase);
- weaknesses += 1;
- }
- if (!hasUppercase) {
- tips.push(translate.addUpperCase);
- weaknesses += 1;
- }
- if (!hasNumbers) {
- tips.push(translate.addNumbers);
- weaknesses += 1;
- }
- if (!hasPunctuation) {
- tips.push(translate.addPunctuation);
- weaknesses += 1;
- }
-
- // Apply penalty for each weakness (balanced against length penalty).
- switch (weaknesses) {
- case 1:
- strength -= 12.5;
- break;
-
- case 2:
- strength -= 25;
- break;
-
- case 3:
- strength -= 40;
- break;
-
- case 4:
- strength -= 40;
- break;
-
- default:
- // Default: 0. Nothing to do.
- break;
- }
-
- // Check if password is the same as the username.
- if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
- tips.push(translate.sameAsUsername);
- // Passwords the same as username are always very weak.
- strength = 5;
- }
-
- // Based on the strength, work out what text should be shown by the
- // password strength meter.
- if (strength < 60) {
- indicatorText = translate.weak;
- indicatorClass = 'is-weak';
- } else if (strength < 70) {
- indicatorText = translate.fair;
- indicatorClass = 'is-fair';
- } else if (strength < 80) {
- indicatorText = translate.good;
- indicatorClass = 'is-good';
- } else if (strength <= 100) {
- indicatorText = translate.strong;
- indicatorClass = 'is-strong';
- }
-
- return {
- strength,
- tips,
- indicatorText,
- indicatorClass,
- };
- };
-
- /**
- * Password strength feedback for password confirm's main input.
- *
- * @param {string} message
- * The prefix text for the strength feedback word.
- *
- * @return {string}
- * The string representing the DOM fragment.
- */
- Drupal.theme.passwordInputHelp = message =>
- `<div class="password-strength">
- <div class="password-strength__track">
- <div class="password-strength__bar js-password-strength-bar"></div>
- </div>
- <div aria-live="polite" aria-atomic="true" class="password-strength__title">
- ${message} <span class="password-strength__text js-password-strength-text"></span>
- </div>
- </div>`;
-
- /**
- * Password match feedback for password confirm input.
- *
- * @param {string} message
- * The message that precedes the yes|no text.
- *
- * @return {string}
- * A string representing the DOM fragment.
- */
- Drupal.theme.passwordConfirmHelp = message =>
- `<div aria-live="polite" aria-atomic="true" class="password-match-message">${message} <span class="password-match-message__text js-password-match-text"></span></div>`;
-
- /**
- * Password suggestions tips.
- *
- * @param {string} title
- * The title that precedes tips.
- * @param {Array.<string>} tips
- * Array containing the tips.
- *
- * @return {string}
- * A string representing the DOM fragment.
- */
- Drupal.theme.passwordSuggestionsTips = (title, tips) =>
- `<div class="password-suggestions">${
- tips.length
- ? `${title}<ul class="password-suggestions__tips"><li class="password-suggestions__tip">${tips.join(
- '</li><li class="password-suggestions__tip">',
- )}</li></ul>`
- : ''
- }</div>`;
-})(jQuery, Drupal);
diff --git a/core/themes/claro/js/user.js b/core/themes/claro/js/user.js
deleted file mode 100644
index fea181e4f6b8596d90e26e26781685e82c16ef16..0000000000000000000000000000000000000000
--- a/core/themes/claro/js/user.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function ($, Drupal) {
- Drupal.behaviors.password = {
- attach: function attach(context, settings) {
- var $passwordInput = $(context).find('input.js-password-field').once('password');
-
- if ($passwordInput.length) {
- var translate = settings.password;
- var $passwordInputParent = $passwordInput.parent();
- var $passwordWidget = $passwordInput.closest('.js-form-type-password-confirm');
- var $passwordConfirmInput = $passwordWidget.find('input.js-password-confirm');
- var $passwordInputHelp = $(Drupal.theme.passwordInputHelp(translate.strengthTitle));
- var $passwordConfirmHelp = $(Drupal.theme.passwordConfirmHelp(translate.confirmTitle));
- var $passwordInputStrengthBar = $passwordInputHelp.find('.js-password-strength-bar');
- var $passwordInputStrengthMessageWrapper = $passwordInputHelp.find('.js-password-strength-text');
- var $passwordConfirmMatch = $passwordConfirmHelp.find('.js-password-match-text');
- var $passwordSuggestionsTips = $(Drupal.theme.passwordSuggestionsTips('', '')).hide();
-
- if (settings.password.showStrengthIndicator) {
- $passwordConfirmInput.after($passwordConfirmHelp).parent().after($passwordSuggestionsTips);
- $passwordInputParent.append($passwordInputHelp);
- }
-
- var passwordCheckMatch = function passwordCheckMatch(confirmInputVal) {
- if (confirmInputVal) {
- var success = $passwordInput.val() === confirmInputVal;
- var confirmClass = success ? 'ok' : 'error';
- var confirmMatchMessage = success ? translate.confirmSuccess : translate.confirmFailure;
-
- if (!$passwordConfirmMatch.hasClass(confirmClass) || !$passwordConfirmMatch.html() === confirmMatchMessage) {
- $passwordConfirmMatch.html(confirmMatchMessage).removeClass('ok error').addClass(confirmClass);
- }
- }
- };
-
- var passwordCheck = function passwordCheck() {
- if (settings.password.showStrengthIndicator) {
- var result = Drupal.evaluatePasswordStrength($passwordInput.val(), settings.password);
- var $newSuggestions = $(Drupal.theme.passwordSuggestionsTips(translate.hasWeaknesses, result.tips));
-
- if ($newSuggestions.html() !== $passwordSuggestionsTips.html()) {
- $passwordSuggestionsTips.replaceWith($newSuggestions);
- $passwordSuggestionsTips = $newSuggestions;
- $passwordSuggestionsTips.toggle(result.strength !== 100);
- }
-
- $passwordInputStrengthBar.css('width', "".concat(result.strength, "%")).removeClass('is-weak is-fair is-good is-strong').addClass(result.indicatorClass);
-
- if (!$passwordInputStrengthMessageWrapper.hasClass(result.indicatorClass) || !$passwordInputStrengthMessageWrapper.html() === result.indicatorText) {
- $passwordInputStrengthMessageWrapper.html(result.indicatorText).removeClass('is-weak is-fair is-good is-strong').addClass(result.indicatorClass);
- }
- }
-
- $passwordWidget.removeClass('is-initial').removeClass('is-password-empty is-password-filled').removeClass('is-confirm-empty is-confirm-filled');
- $passwordWidget.addClass($passwordInput.val() ? 'is-password-filled' : 'is-password-empty');
- passwordCheckMatch($passwordConfirmInput.val());
- $passwordWidget.addClass($passwordConfirmInput.val() ? 'is-confirm-filled' : 'is-confirm-empty');
- };
-
- $passwordWidget.addClass($passwordInput.val() ? 'is-password-filled' : 'is-password-empty').addClass($passwordConfirmInput.val() ? 'is-confirm-filled' : 'is-confirm-empty');
- $passwordInput.on('input', passwordCheck);
- $passwordConfirmInput.on('input', passwordCheck);
- }
- }
- };
-
- Drupal.evaluatePasswordStrength = function (password, translate) {
- password = password.trim();
- var indicatorText;
- var indicatorClass;
- var weaknesses = 0;
- var strength = 100;
- var tips = [];
- var hasLowercase = /[a-z]/.test(password);
- var hasUppercase = /[A-Z]/.test(password);
- var hasNumbers = /[0-9]/.test(password);
- var hasPunctuation = /[^a-zA-Z0-9]/.test(password);
- var $usernameBox = $('input.username');
- var username = $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
-
- if (password.length < 12) {
- tips.push(translate.tooShort);
- strength -= (12 - password.length) * 5 + 30;
- }
-
- if (!hasLowercase) {
- tips.push(translate.addLowerCase);
- weaknesses += 1;
- }
-
- if (!hasUppercase) {
- tips.push(translate.addUpperCase);
- weaknesses += 1;
- }
-
- if (!hasNumbers) {
- tips.push(translate.addNumbers);
- weaknesses += 1;
- }
-
- if (!hasPunctuation) {
- tips.push(translate.addPunctuation);
- weaknesses += 1;
- }
-
- switch (weaknesses) {
- case 1:
- strength -= 12.5;
- break;
-
- case 2:
- strength -= 25;
- break;
-
- case 3:
- strength -= 40;
- break;
-
- case 4:
- strength -= 40;
- break;
-
- default:
- break;
- }
-
- if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
- tips.push(translate.sameAsUsername);
- strength = 5;
- }
-
- if (strength < 60) {
- indicatorText = translate.weak;
- indicatorClass = 'is-weak';
- } else if (strength < 70) {
- indicatorText = translate.fair;
- indicatorClass = 'is-fair';
- } else if (strength < 80) {
- indicatorText = translate.good;
- indicatorClass = 'is-good';
- } else if (strength <= 100) {
- indicatorText = translate.strong;
- indicatorClass = 'is-strong';
- }
-
- return {
- strength: strength,
- tips: tips,
- indicatorText: indicatorText,
- indicatorClass: indicatorClass
- };
- };
-
- Drupal.theme.passwordInputHelp = function (message) {
- return "<div class=\"password-strength\">\n <div class=\"password-strength__track\">\n <div class=\"password-strength__bar js-password-strength-bar\"></div>\n </div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">\n ".concat(message, " <span class=\"password-strength__text js-password-strength-text\"></span>\n </div>\n </div>");
- };
-
- Drupal.theme.passwordConfirmHelp = function (message) {
- return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-match-message\">".concat(message, " <span class=\"password-match-message__text js-password-match-text\"></span></div>");
- };
-
- Drupal.theme.passwordSuggestionsTips = function (title, tips) {
- return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(title, "<ul class=\"password-suggestions__tips\"><li class=\"password-suggestions__tip\">").concat(tips.join('</li><li class="password-suggestions__tip">'), "</li></ul>") : '', "</div>");
- };
-})(jQuery, Drupal);
\ No newline at end of file
diff --git a/core/themes/claro/js/user.theme.es6.js b/core/themes/claro/js/user.theme.es6.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff269eb18380952e98eb1fd616ebb621b7c4066c
--- /dev/null
+++ b/core/themes/claro/js/user.theme.es6.js
@@ -0,0 +1,81 @@
+/**
+ * @file
+ * Password confirm widget template overrides.
+ */
+
+(Drupal => {
+ Object.assign(Drupal.user.password.css, {
+ passwordWeak: 'is-weak',
+ widgetInitial: 'is-initial',
+ passwordEmpty: 'is-password-empty',
+ passwordFilled: 'is-password-filled',
+ confirmEmpty: 'is-confirm-empty',
+ confirmFilled: 'is-confirm-filled',
+ });
+
+ /**
+ * Constructs a password confirm message element.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.confirmTitle
+ * The translated confirm description that labels the actual confirm text.
+ *
+ * @return {string}
+ * Markup for the password confirm message.
+ */
+ Drupal.theme.passwordConfirmMessage = ({ confirmTitle }) => {
+ const confirmTextWrapper =
+ '<span class="password-match-message__text" data-drupal-selector="password-match-status-text"></span>';
+ return `<div aria-live="polite" aria-atomic="true" class="password-match-message" data-drupal-selector="password-confirm-message">${confirmTitle} ${confirmTextWrapper}</div>`;
+ };
+
+ /**
+ * Constructs a password strength message.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.strengthTitle
+ * The title that precedes the strength text.
+ *
+ * @return {string}
+ * Markup for the password strength indicator.
+ */
+ Drupal.theme.passwordStrength = ({ strengthTitle }) => {
+ const strengthBar =
+ '<div class="password-strength__bar" data-drupal-selector="password-strength-indicator"></div>';
+ const strengthText =
+ '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return `
+ <div class="password-strength">
+ <div class="password-strength__track" data-drupal-selector="password-strength-meter">${strengthBar}</div>
+ <div aria-live="polite" aria-atomic="true" class="password-strength__title">${strengthTitle} ${strengthText}</div>
+ </div>
+ `;
+ };
+
+ /**
+ * Constructs password suggestions tips.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated tex t to
+ * display.
+ * @param {string} passwordSettings.hasWeaknesses
+ * The title that precedes tips.
+ * @param {Array.<string>} tips
+ * Array containing the tips.
+ *
+ * @return {string}
+ * Markup for the password suggestions.
+ */
+ Drupal.theme.passwordSuggestions = ({ hasWeaknesses }, tips) =>
+ `<div class="password-suggestions">${
+ tips.length
+ ? `${hasWeaknesses}<ul class="password-suggestions__tips"><li class="password-suggestions__tip">${tips.join(
+ '</li><li class="password-suggestions__tip">',
+ )}</li></ul>`
+ : ''
+ }</div>`;
+})(Drupal);
diff --git a/core/themes/claro/js/user.theme.js b/core/themes/claro/js/user.theme.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2e3b141d99315847d20a99be78ff1a541e65a01
--- /dev/null
+++ b/core/themes/claro/js/user.theme.js
@@ -0,0 +1,35 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Object.assign(Drupal.user.password.css, {
+ passwordWeak: 'is-weak',
+ widgetInitial: 'is-initial',
+ passwordEmpty: 'is-password-empty',
+ passwordFilled: 'is-password-filled',
+ confirmEmpty: 'is-confirm-empty',
+ confirmFilled: 'is-confirm-filled'
+ });
+
+ Drupal.theme.passwordConfirmMessage = function (_ref) {
+ var confirmTitle = _ref.confirmTitle;
+ var confirmTextWrapper = '<span class="password-match-message__text" data-drupal-selector="password-match-status-text"></span>';
+ return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-match-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
+ };
+
+ Drupal.theme.passwordStrength = function (_ref2) {
+ var strengthTitle = _ref2.strengthTitle;
+ var strengthBar = '<div class="password-strength__bar" data-drupal-selector="password-strength-indicator"></div>';
+ var strengthText = '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return "\n <div class=\"password-strength\">\n <div class=\"password-strength__track\" data-drupal-selector=\"password-strength-meter\">".concat(strengthBar, "</div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n </div>\n ");
+ };
+
+ Drupal.theme.passwordSuggestions = function (_ref3, tips) {
+ var hasWeaknesses = _ref3.hasWeaknesses;
+ return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(hasWeaknesses, "<ul class=\"password-suggestions__tips\"><li class=\"password-suggestions__tip\">").concat(tips.join('</li><li class="password-suggestions__tip">'), "</li></ul>") : '', "</div>");
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/core/themes/stable/js/user.theme.es6.js b/core/themes/stable/js/user.theme.es6.js
index 30d0aa9227bd68ef5ce3ad6d98d4e3c3784e36f0..9c4f22d6cb84b8d3c9da8e024f5ce515cd3164c4 100644
--- a/core/themes/stable/js/user.theme.es6.js
+++ b/core/themes/stable/js/user.theme.es6.js
@@ -11,5 +11,30 @@
* A string representing a DOM fragment.
*/
Drupal.theme.passwordConfirmMessage = translate =>
- `<div aria-live="polite" aria-atomic="true" class="password-confirm js-password-confirm js-password-confirm-message">${translate.confirmTitle} <span></span></div>`;
+ `<div aria-live="polite" aria-atomic="true" class="password-confirm js-password-confirm js-password-confirm-message" data-drupal-selector="password-confirm-message">${translate.confirmTitle} <span data-drupal-selector="password-match-status-text"></span></div>`;
+
+ /**
+ * Constructs a password strength message.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.strengthTitle
+ * The title that precedes the strength text.
+ *
+ * @return {string}
+ * Markup for password strength message.
+ */
+ Drupal.theme.passwordStrength = ({ strengthTitle }) => {
+ const strengthIndicator =
+ '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ const strengthText =
+ '<span class="password-strength__text js-password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return `
+ <div class="password-strength">
+ <div class="password-strength__meter" data-drupal-selector="password-strength-meter">${strengthIndicator}</div>
+ <div aria-live="polite" aria-atomic="true" class="password-strength__title">${strengthTitle} ${strengthText}</div>
+ </div>
+ `;
+ };
})(Drupal);
diff --git a/core/themes/stable/js/user.theme.js b/core/themes/stable/js/user.theme.js
index fa8aadefd9534da6a59b281423ce04773b71106a..2c76f6f1d238d155238995c87372d9d2af7a1d8b 100644
--- a/core/themes/stable/js/user.theme.js
+++ b/core/themes/stable/js/user.theme.js
@@ -7,6 +7,13 @@
(function (Drupal) {
Drupal.theme.passwordConfirmMessage = function (translate) {
- return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm js-password-confirm js-password-confirm-message\">".concat(translate.confirmTitle, " <span></span></div>");
+ return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm js-password-confirm js-password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(translate.confirmTitle, " <span data-drupal-selector=\"password-match-status-text\"></span></div>");
+ };
+
+ Drupal.theme.passwordStrength = function (_ref) {
+ var strengthTitle = _ref.strengthTitle;
+ var strengthIndicator = '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ var strengthText = '<span class="password-strength__text js-password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return "\n <div class=\"password-strength\">\n <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n </div>\n ");
};
})(Drupal);
\ No newline at end of file
diff --git a/core/themes/stable9/js/user.theme.es6.js b/core/themes/stable9/js/user.theme.es6.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba20b55a8dc35a4089dfaf02eb2410c00f27c2b5
--- /dev/null
+++ b/core/themes/stable9/js/user.theme.es6.js
@@ -0,0 +1,49 @@
+/**
+ * @file
+ * Stable theme overrides for user password forms.
+ */
+
+(Drupal => {
+ /**
+ * Constructs a password confirm message element.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.confirmTitle
+ * The translated confirm description that labels the actual confirm text.
+ *
+ * @return {string}
+ * Markup for the password confirm message.
+ */
+ Drupal.theme.passwordConfirmMessage = ({ confirmTitle }) => {
+ const confirmTextWrapper =
+ '<span data-drupal-selector="password-match-status-text"></span>';
+ return `<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message" data-drupal-selector="password-confirm-message">${confirmTitle} ${confirmTextWrapper}</div>`;
+ };
+
+ /**
+ * Constructs a password strength message.
+ *
+ * @param {object} passwordSettings
+ * An object containing password related settings and translated text to
+ * display.
+ * @param {string} passwordSettings.strengthTitle
+ * The title that precedes the strength text.
+ *
+ * @return {string}
+ * Markup for password strength message.
+ */
+ Drupal.theme.passwordStrength = ({ strengthTitle }) => {
+ const strengthIndicator =
+ '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ const strengthText =
+ '<span class="password-strength__text js-password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return `
+ <div class="password-strength">
+ <div class="password-strength__meter" data-drupal-selector="password-strength-meter">${strengthIndicator}</div>
+ <div aria-live="polite" aria-atomic="true" class="password-strength__title">${strengthTitle} ${strengthText}</div>
+ </div>
+ `;
+ };
+})(Drupal);
diff --git a/core/themes/stable9/js/user.theme.js b/core/themes/stable9/js/user.theme.js
new file mode 100644
index 0000000000000000000000000000000000000000..4324b8cc3c667217abe5af5180f3bf88c98ca57a
--- /dev/null
+++ b/core/themes/stable9/js/user.theme.js
@@ -0,0 +1,21 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.passwordConfirmMessage = function (_ref) {
+ var confirmTitle = _ref.confirmTitle;
+ var confirmTextWrapper = '<span data-drupal-selector="password-match-status-text"></span>';
+ return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
+ };
+
+ Drupal.theme.passwordStrength = function (_ref2) {
+ var strengthTitle = _ref2.strengthTitle;
+ var strengthIndicator = '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
+ var strengthText = '<span class="password-strength__text js-password-strength__text" data-drupal-selector="password-strength-text"></span>';
+ return "\n <div class=\"password-strength\">\n <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n </div>\n ");
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/core/yarn.lock b/core/yarn.lock
index b57efaa0a120be6b4530f15c12ea3e5cd384d187..d5c12c0ed1be628f58caf1090563e2f6aa72830e 100644
--- a/core/yarn.lock
+++ b/core/yarn.lock
@@ -808,6 +808,11 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
+"@csstools/convert-colors@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
+ integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
+
"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1296,6 +1301,16 @@ browserslist@^4.12.0, browserslist@^4.8.5:
node-releases "^1.1.53"
pkg-up "^2.0.0"
+browserslist@^4.6.4:
+ version "4.14.5"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+ integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+ dependencies:
+ caniuse-lite "^1.0.30001135"
+ electron-to-chromium "^1.3.571"
+ escalade "^3.1.0"
+ node-releases "^1.1.61"
+
buffer-crc32@~0.2.3:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -1393,6 +1408,11 @@ caniuse-db@^1.0.30000639:
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001076.tgz#bbd4b054164a81506f75c28acdc72261712ddb96"
integrity sha512-xakM7JFFxRXDZc5OJa97zBp0tRlW1NUgvLxLD0i9TUQ76wbHUAbpbFNb35uDOAur2eLqvHmoArqHXGMUoiK+oA==
+caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001135:
+ version "1.0.30001137"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz#6f0127b1d3788742561a25af3607a17fc778b803"
+ integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==
+
caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
version "1.0.30001066"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz#0a8a58a10108f2b9bf38e7b65c237b12fd9c5f04"
@@ -1602,7 +1622,7 @@ color-name@1.1.3:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-color-name@^1.1.4, color-name@~1.1.4:
+color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -2033,6 +2053,38 @@ cspell@^4.0.63:
glob "^7.1.6"
minimatch "^3.0.4"
+css-blank-pseudo@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
+ integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
+ dependencies:
+ postcss "^7.0.5"
+
+css-has-pseudo@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
+ integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
+ dependencies:
+ postcss "^7.0.6"
+ postcss-selector-parser "^5.0.0-rc.4"
+
+css-prefers-color-scheme@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
+ integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
+ dependencies:
+ postcss "^7.0.5"
+
+cssdb@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
+ integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==
+
+cssesc@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
+ integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+
cssesc@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -2316,6 +2368,11 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.413:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.456.tgz#5125bce136b04a8e39473696509e83038f679cbd"
integrity sha512-jaVZ9+8HG2qvEN7c9r5EVguvhtevITJou4L10XuqoiZUoXIMF5qLG1pB9raP3WFcME4exDZRq1b6qyCA+u5Vew==
+electron-to-chromium@^1.3.571:
+ version "1.3.574"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz#bdd87f62fe70165e5c862a0acf0cee9889e23aa3"
+ integrity sha512-kF8Bfe1h8X1pPwlw6oRoIXj0DevowviP6fl0wcljm+nZjy/7+Fos4THo1N/7dVGEJlyEqK9C8qNnbheH+Eazfw==
+
emoji-regex@^7.0.1, emoji-regex@^7.0.2:
version "7.0.3"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -2386,6 +2443,11 @@ es6-promisify@^5.0.0:
dependencies:
es6-promise "^4.0.3"
+escalade@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+ integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
+
escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -3396,11 +3458,6 @@ ip-regex@^2.1.0:
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-ip-regex@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.1.0.tgz#5ad62f685a14edb421abebc2fff8db94df67b455"
- integrity sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==
-
ip@1.1.5, ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -3660,13 +3717,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-is-url-superb@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-3.0.0.tgz#b9a1da878a1ac73659047d1e6f4ef22c209d3e25"
- integrity sha512-3faQP+wHCGDQT1qReM5zCPx2mxoal6DzbzquFlCYJLWyy4WPTved33ea2xFbX37z4NoriEwZGIYhFtx8RUB5wQ==
- dependencies:
- url-regex "^5.0.0"
-
is-url@^1.2.2:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
@@ -3995,6 +4045,11 @@ lodash._isiterateecall@^3.0.0:
resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+lodash._reinterpolate@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+ integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
lodash.clone@3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-3.0.3.tgz#84688c73d32b5a90ca25616963f189252a997043"
@@ -4033,6 +4088,21 @@ lodash.merge@^4.6.2:
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+lodash.template@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+ integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+ dependencies:
+ lodash._reinterpolate "^3.0.0"
+ lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+ integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+ dependencies:
+ lodash._reinterpolate "^3.0.0"
+
lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -4445,6 +4515,11 @@ node-releases@^1.1.53:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.57.tgz#f6754ce225fad0611e61228df3e09232e017ea19"
integrity sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==
+node-releases@^1.1.61:
+ version "1.1.61"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+ integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
+
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -4887,6 +4962,14 @@ posix-character-classes@^0.1.0:
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+postcss-attribute-case-insensitive@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
+ integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-selector-parser "^6.0.2"
+
postcss-calc@^7.0.1:
version "7.0.2"
resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
@@ -4896,13 +4979,122 @@ postcss-calc@^7.0.1:
postcss-selector-parser "^6.0.2"
postcss-value-parser "^4.0.2"
-postcss-custom-properties@^9.0.2:
- version "9.1.1"
- resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-9.1.1.tgz#55822d70ff48004f6d307a338ba64a7fb0a4bfff"
- integrity sha512-GVu+j7vwMTKUGhGXckYAFAAG5tTJUkSt8LuSyimtZdVVmdAEZYYqserkAgX8vwMhgGDPA4vJtWt7VgFxgiooDA==
+postcss-color-functional-notation@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
+ integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
+postcss-color-gray@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
+ integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==
+ dependencies:
+ "@csstools/convert-colors" "^1.4.0"
+ postcss "^7.0.5"
+ postcss-values-parser "^2.0.0"
+
+postcss-color-hex-alpha@^5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
+ integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==
+ dependencies:
+ postcss "^7.0.14"
+ postcss-values-parser "^2.0.1"
+
+postcss-color-mod-function@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
+ integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==
+ dependencies:
+ "@csstools/convert-colors" "^1.4.0"
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
+postcss-color-rebeccapurple@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
+ integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
+postcss-custom-media@^7.0.8:
+ version "7.0.8"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
+ integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==
+ dependencies:
+ postcss "^7.0.14"
+
+postcss-custom-properties@^8.0.11:
+ version "8.0.11"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
+ integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==
dependencies:
postcss "^7.0.17"
- postcss-values-parser "^3.0.5"
+ postcss-values-parser "^2.0.1"
+
+postcss-custom-selectors@^5.1.2:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
+ integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-selector-parser "^5.0.0-rc.3"
+
+postcss-dir-pseudo-class@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
+ integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-selector-parser "^5.0.0-rc.3"
+
+postcss-double-position-gradients@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
+ integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==
+ dependencies:
+ postcss "^7.0.5"
+ postcss-values-parser "^2.0.0"
+
+postcss-env-function@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
+ integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
+postcss-focus-visible@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
+ integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-focus-within@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
+ integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-font-variant@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz#71dd3c6c10a0d846c5eda07803439617bbbabacc"
+ integrity sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-gap-properties@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
+ integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==
+ dependencies:
+ postcss "^7.0.2"
postcss-header@^2.0.0:
version "2.0.0"
@@ -4919,6 +5111,14 @@ postcss-html@^0.36.0:
dependencies:
htmlparser2 "^3.10.0"
+postcss-image-set-function@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
+ integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
postcss-import@^12.0.1:
version "12.0.1"
resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
@@ -4929,6 +5129,14 @@ postcss-import@^12.0.1:
read-cache "^1.0.0"
resolve "^1.1.7"
+postcss-initial@^3.0.0:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d"
+ integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==
+ dependencies:
+ lodash.template "^4.5.0"
+ postcss "^7.0.2"
+
postcss-jsx@^0.36.0:
version "0.36.4"
resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.4.tgz#37a68f300a39e5748d547f19a747b3257240bd50"
@@ -4936,6 +5144,15 @@ postcss-jsx@^0.36.0:
dependencies:
"@babel/core" ">=7.2.2"
+postcss-lab-function@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
+ integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==
+ dependencies:
+ "@csstools/convert-colors" "^1.4.0"
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
postcss-less@^3.1.0, postcss-less@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
@@ -4943,6 +5160,13 @@ postcss-less@^3.1.0, postcss-less@^3.1.4:
dependencies:
postcss "^7.0.14"
+postcss-logical@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
+ integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==
+ dependencies:
+ postcss "^7.0.2"
+
postcss-markdown@^0.36.0:
version "0.36.0"
resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz#7f22849ae0e3db18820b7b0d5e7833f13a447560"
@@ -4951,11 +5175,105 @@ postcss-markdown@^0.36.0:
remark "^10.0.1"
unist-util-find-all-after "^1.0.2"
+postcss-media-minmax@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
+ integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==
+ dependencies:
+ postcss "^7.0.2"
+
postcss-media-query-parser@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
+postcss-nesting@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
+ integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-overflow-shorthand@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
+ integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-page-break@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
+ integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==
+ dependencies:
+ postcss "^7.0.2"
+
+postcss-place@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
+ integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-values-parser "^2.0.0"
+
+postcss-preset-env@^6.7.0:
+ version "6.7.0"
+ resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
+ integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
+ dependencies:
+ autoprefixer "^9.6.1"
+ browserslist "^4.6.4"
+ caniuse-lite "^1.0.30000981"
+ css-blank-pseudo "^0.1.4"
+ css-has-pseudo "^0.10.0"
+ css-prefers-color-scheme "^3.1.1"
+ cssdb "^4.4.0"
+ postcss "^7.0.17"
+ postcss-attribute-case-insensitive "^4.0.1"
+ postcss-color-functional-notation "^2.0.1"
+ postcss-color-gray "^5.0.0"
+ postcss-color-hex-alpha "^5.0.3"
+ postcss-color-mod-function "^3.0.3"
+ postcss-color-rebeccapurple "^4.0.1"
+ postcss-custom-media "^7.0.8"
+ postcss-custom-properties "^8.0.11"
+ postcss-custom-selectors "^5.1.2"
+ postcss-dir-pseudo-class "^5.0.0"
+ postcss-double-position-gradients "^1.0.0"
+ postcss-env-function "^2.0.2"
+ postcss-focus-visible "^4.0.0"
+ postcss-focus-within "^3.0.0"
+ postcss-font-variant "^4.0.0"
+ postcss-gap-properties "^2.0.0"
+ postcss-image-set-function "^3.0.1"
+ postcss-initial "^3.0.0"
+ postcss-lab-function "^2.0.1"
+ postcss-logical "^3.0.0"
+ postcss-media-minmax "^4.0.0"
+ postcss-nesting "^7.0.0"
+ postcss-overflow-shorthand "^2.0.0"
+ postcss-page-break "^2.0.0"
+ postcss-place "^4.0.1"
+ postcss-pseudo-class-any-link "^6.0.0"
+ postcss-replace-overflow-wrap "^3.0.0"
+ postcss-selector-matches "^4.0.0"
+ postcss-selector-not "^4.0.0"
+
+postcss-pseudo-class-any-link@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
+ integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==
+ dependencies:
+ postcss "^7.0.2"
+ postcss-selector-parser "^5.0.0-rc.3"
+
+postcss-replace-overflow-wrap@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
+ integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==
+ dependencies:
+ postcss "^7.0.2"
+
postcss-reporter@^1.3.3:
version "1.4.1"
resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
@@ -5011,6 +5329,22 @@ postcss-scss@^2.0.0:
dependencies:
postcss "^7.0.6"
+postcss-selector-matches@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
+ integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==
+ dependencies:
+ balanced-match "^1.0.0"
+ postcss "^7.0.2"
+
+postcss-selector-not@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz#c68ff7ba96527499e832724a2674d65603b645c0"
+ integrity sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==
+ dependencies:
+ balanced-match "^1.0.0"
+ postcss "^7.0.2"
+
postcss-selector-parser@^2.0.0:
version "2.2.3"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
@@ -5029,6 +5363,15 @@ postcss-selector-parser@^3.1.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
+postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+ integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
+ dependencies:
+ cssesc "^2.0.0"
+ indexes-of "^1.0.1"
+ uniq "^1.0.1"
+
postcss-selector-parser@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
@@ -5072,15 +5415,14 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-postcss-values-parser@^3.0.5:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-3.2.1.tgz#55114607de6631338ba8728d3e9c15785adcc027"
- integrity sha512-SQ7/88VE9LhJh9gc27/hqnSU/aZaREVJcRVccXBmajgP2RkjdJzNyH/a9GCVMI5nsRhT0jC5HpUMwfkz81DVVg==
+postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
+ integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
dependencies:
- color-name "^1.1.4"
- is-url-superb "^3.0.0"
- postcss "^7.0.5"
- url-regex "^5.0.0"
+ flatten "^1.0.2"
+ indexes-of "^1.0.1"
+ uniq "^1.0.1"
postcss@^5.0.0, postcss@^5.0.18:
version "5.2.18"
@@ -6343,11 +6685,6 @@ thunkify@^2.1.2:
resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
-tlds@^1.203.0:
- version "1.207.0"
- resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.207.0.tgz#459264e644cf63ddc0965fece3898913286b1afd"
- integrity sha512-k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg==
-
tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -6681,14 +7018,6 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-url-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-5.0.0.tgz#8f5456ab83d898d18b2f91753a702649b873273a"
- integrity sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==
- dependencies:
- ip-regex "^4.1.0"
- tlds "^1.203.0"
-
use@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"