.gitlab-ci.yml

@@ -56,7 +56,7 @@ workflow:
 ################
 
 variables:
-  _CONFIG_DOCKERHUB_ROOT: "drupalci"
+  _CONFIG_DOCKERHUB_ROOT: "registry.gitlab.com/drupal-infrastructure/drupalci/drupalci-environments"
   CACHE_TARGET: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}"
   CORE_GITLAB_PROJECT_ID: 59858
   # Let composer know what self.version means.

composer.lock

@@ -496,7 +496,7 @@
             "dist": {
                 "type": "path",
                 "url": "core",
-                "reference": "71f1c41d5a7257b966c16db78005a9cf1e148557"
+                "reference": "7e8f42a2a16fa8db35c42d6ba0c7bcc9b3508588"
             },
             "require": {
                 "asm89/stack-cors": "^2.3",
@@ -539,7 +539,6 @@
                 "symfony/mailer": "^7.2",
                 "symfony/mime": "^7.2",
                 "symfony/polyfill-iconv": "^1.26",
-                "symfony/polyfill-intl-icu": "^1.26",
                 "symfony/process": "^7.2",
                 "symfony/psr-http-message-bridge": "^7.2",
                 "symfony/routing": "^7.2",
@@ -578,7 +577,6 @@
                 "drupal/core-version": "self.version"
             },
             "suggest": {
-                "ext-intl": "Needed to extend symfony/polyfill-intl-icu capability with the sorting of non-english languages.",
                 "ext-zip": "Needed to extend the plugin.manager.archiver service capability with the handling of files in the ZIP format."
             },
             "type": "drupal-core",
@@ -3272,90 +3270,6 @@
             ],
             "time": "2024-09-09T11:45:10+00:00"
         },
-        {
-            "name": "symfony/polyfill-intl-icu",
-            "version": "v1.31.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-icu.git",
-                "reference": "d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78",
-                "reference": "d80a05e9904d2c2b9b95929f3e4b5d3a8f418d78",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "suggest": {
-                "ext-intl": "For best performance and support of other locales than \"en\""
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Icu\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ],
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's ICU-related data and classes",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "icu",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.31.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-09T11:45:10+00:00"
-        },
         {
             "name": "symfony/polyfill-intl-idn",
             "version": "v1.31.0",

composer/Metapackage/CoreRecommended/composer.json

@@ -48,7 +48,6 @@
         "symfony/polyfill-ctype": "~v1.31.0",
         "symfony/polyfill-iconv": "~v1.31.0",
         "symfony/polyfill-intl-grapheme": "~v1.31.0",
-        "symfony/polyfill-intl-icu": "~v1.31.0",
         "symfony/polyfill-intl-idn": "~v1.31.0",
         "symfony/polyfill-intl-normalizer": "~v1.31.0",
         "symfony/polyfill-mbstring": "~v1.31.0",

core/.deprecation-ignore.txt

@@ -32,3 +32,12 @@
 # Symfony 7.2
 %Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_length" option is deprecated and will be ignored in Symfony 8.0.%
 %Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_bits_per_character" option is deprecated and will be ignored in Symfony 8.0.%
+
+# PHPUnit 12.
+%The "Drupal\\Core\\Database\\Query\\Select::hasAllTags\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+%The "Drupal\\Core\\Database\\Query\\Select::hasAnyTag\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+%The "Drupal\\Core\\Database\\Query\\SelectExtender::hasAllTags\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+%The "Drupal\\Core\\Database\\Query\\SelectExtender::hasAnyTag\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+%The "Drupal\\Core\\Entity\\Query\\QueryBase::hasAllTags\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+%The "Drupal\\Core\\Entity\\Query\\QueryBase::hasAnyTag\(\)" method will require a new "string \.\.\. \$tags" argument in the next major version of its interface%
+

core/assets/schemas/v1/metadata-full.schema.json

@@ -5,7 +5,7 @@
     "slotDefinition": {
       "type": "object",
       "patternProperties": {
-        "^[a-zA-Z0-9_-]$": {
+        "^[a-zA-Z0-9_-]+$": {
           "type": "object",
           "properties": {
             "title": {

core/assets/schemas/v1/metadata.schema.json

@@ -5,7 +5,7 @@
     "slotDefinition": {
       "type": "object",
       "patternProperties": {
-        "^[a-zA-Z0-9_-]$": {
+        "^[a-zA-Z0-9_-]+$": {
           "type": "object",
           "properties": {
             "title": {

core/composer.json

@@ -33,7 +33,6 @@
         "symfony/validator": "^7.2",
         "symfony/process": "^7.2",
         "symfony/polyfill-iconv": "^1.26",
-        "symfony/polyfill-intl-icu": "^1.26",
         "symfony/yaml": "^7.2",
         "revolt/event-loop": "^1.0",
         "twig/twig": "^3.15.0",
@@ -121,7 +120,6 @@
         "preferred-install": "dist"
     },
     "suggest": {
-        "ext-intl": "Needed to extend symfony/polyfill-intl-icu capability with the sorting of non-english languages.",
         "ext-zip": "Needed to extend the plugin.manager.archiver service capability with the handling of files in the ZIP format."
     },
     "extra": {

core/lib/Drupal/Component/Utility/Xss.php

@@ -275,7 +275,7 @@ protected static function split($string, array $html_tags, $class) {
    * @param string $attributes
    *   The html attribute to process.
    *
-   * @return string
+   * @return array
    *   Cleaned up version of the HTML attributes.
    */
   protected static function attributes($attributes) {

core/lib/Drupal/Core/Cache/VariationCache.php

@@ -12,6 +12,25 @@
  */
 class VariationCache implements VariationCacheInterface {
 
+  /**
+   * Stores redirect chain lookups until the next set, invalidate or delete.
+   *
+   * Array keys are the cache IDs constructed from the cache keys and initial
+   * cacheability and values are arrays where each step of a redirect chain is
+   * recorded.
+   *
+   * These arrays are indexed by the cache IDs being followed during the chain
+   * and the CacheRedirect objects that construct the chain. At the end there
+   * should always be a value of FALSE for a cache miss, or a CacheRedirect for
+   * a cache hit because we cannot store the cache hit itself into a property
+   * that does not support invalidation based on cache metadata. By storing the
+   * last CacheRedirect that led to the hit, we can at least avoid having to
+   * retrieve the entire chain again to get to the actual cached data.
+   *
+   * @var array
+   */
+  protected array $redirectChainCache = [];
+
   /**
    * Constructs a new VariationCache object.
    *
@@ -33,7 +52,7 @@ public function __construct(
    */
   public function get(array $keys, CacheableDependencyInterface $initial_cacheability) {
     $chain = $this->getRedirectChain($keys, $initial_cacheability);
-    return array_pop($chain);
+    return end($chain);
   }
 
   /**
@@ -45,13 +64,39 @@ public function getMultiple(array $items): array {
     // following of redirect chains by calling ::getMultiple() on the underlying
     // cache backend.
     //
+    // However, ::getRedirectChain() has an internal cache that we could both
+    // benefit from and contribute to whenever we call this function. So any use
+    // or manipulation of $this->redirectChainCache below is for optimization
+    // purposes. A description of the internal cache structure is on the
+    // property documentation of $this->redirectChainCache.
+    //
     // Create a map of CIDs with their associated $items index and cache keys.
     $cid_map = [];
     foreach ($items as $index => [$keys, $cacheability]) {
-      $cid = $this->createCacheIdFast($keys, $cacheability);
+      // Try to optimize based on the cached redirect chain.
+      if ($chain = $this->getValidatedCachedRedirectChain($keys, $cacheability)) {
+        $last_item = end($chain);
+
+        // Immediately skip processing the CID for cache misses.
+        if ($last_item === FALSE) {
+          continue;
+        }
+
+        // We do not need to calculate the initial CID as its part of the chain.
+        $initial_cid = array_key_first($chain);
+
+        // Prime the CID map with the last known redirect for the initial CID.
+        assert($last_item->data instanceof CacheRedirect);
+        $cid = $this->createCacheIdFast($keys, $last_item->data);
+      }
+      else {
+        $cid = $initial_cid = $this->createCacheIdFast($keys, $cacheability);
+      }
+
       $cid_map[$cid] = [
         'index' => $index,
         'keys' => $keys,
+        'initial' => $initial_cid,
       ];
     }
 
@@ -71,12 +116,20 @@ public function getMultiple(array $items): array {
         if ($result->data instanceof CacheRedirect) {
           $redirect_cid = $this->createCacheIdFast($info['keys'], $result->data);
           $new_cid_map[$redirect_cid] = $info;
+          $this->redirectChainCache[$info['initial']][$cid] = $result;
           continue;
         }
 
         $results[$info['index']] = $result;
       }
 
+      // Any CID that did not get a cache hit is still in $fetch_cids. Add them
+      // to the internal redirect chain cache as a miss.
+      foreach ($fetch_cids as $fetch_cid) {
+        $info = $cid_map[$fetch_cid];
+        $this->redirectChainCache[$info['initial']][$fetch_cid] = FALSE;
+      }
+
       $cid_map = $new_cid_map;
     }
 
@@ -224,6 +277,7 @@ public function set(array $keys, $data, CacheableDependencyInterface $cacheabili
       $this->cacheBackend->set($chain_cid, new CacheRedirect($cacheability));
     }
 
+    unset($this->redirectChainCache[$this->createCacheIdFast($keys, $initial_cacheability)]);
     $this->cacheBackend->set($cid, $data, $this->maxAgeToExpire($cacheability->getCacheMaxAge()), $optimized_cacheability->getCacheTags());
   }
 
@@ -232,6 +286,13 @@ public function set(array $keys, $data, CacheableDependencyInterface $cacheabili
    */
   public function delete(array $keys, CacheableDependencyInterface $initial_cacheability): void {
     $chain = $this->getRedirectChain($keys, $initial_cacheability);
+
+    // Don't need to delete what could not be found.
+    if (end($chain) === FALSE) {
+      return;
+    }
+
+    unset($this->redirectChainCache[$this->createCacheIdFast($keys, $initial_cacheability)]);
     $this->cacheBackend->delete(array_key_last($chain));
   }
 
@@ -240,6 +301,13 @@ public function delete(array $keys, CacheableDependencyInterface $initial_cachea
    */
   public function invalidate(array $keys, CacheableDependencyInterface $initial_cacheability): void {
     $chain = $this->getRedirectChain($keys, $initial_cacheability);
+
+    // Don't need to invalidate what could not be found.
+    if (end($chain) === FALSE) {
+      return;
+    }
+
+    unset($this->redirectChainCache[$this->createCacheIdFast($keys, $initial_cacheability)]);
     $this->cacheBackend->invalidate(array_key_last($chain));
   }
 
@@ -261,17 +329,82 @@ public function invalidate(array $keys, CacheableDependencyInterface $initial_ca
    *   to query the cache for that result.
    */
   protected function getRedirectChain(array $keys, CacheableDependencyInterface $initial_cacheability): array {
-    $cid = $this->createCacheIdFast($keys, $initial_cacheability);
-    $chain[$cid] = $result = $this->cacheBackend->get($cid);
+    $chain = $this->getValidatedCachedRedirectChain($keys, $initial_cacheability);
+
+    // Initiate the chain if we couldn't retrieve (a partial) one from memory.
+    if (empty($chain)) {
+      $cid = $initial_cid = $this->createCacheIdFast($keys, $initial_cacheability);
+      $chain[$cid] = $result = $this->cacheBackend->get($cid);
+    }
+    // If we did find one, we continue our search from the last valid redirect
+    // in the chain or bypass the while loop below in case the chain ends in
+    // FALSE, indicating a previous cache miss.
+    else {
+      $initial_cid = array_key_first($chain);
+      $result = end($chain);
+    }
 
     while ($result && $result->data instanceof CacheRedirect) {
       $cid = $this->createCacheIdFast($keys, $result->data);
       $chain[$cid] = $result = $this->cacheBackend->get($cid);
     }
 
+    // When storing the redirect chain in memory we must take care to not store
+    // a cache hit as they can be invalidated, unlike CacheRedirect objects. We
+    // do store the rest of the chain because redirects can be reused safely.
+    $chain_to_cache = $chain;
+    if ($result !== FALSE) {
+      array_pop($chain_to_cache);
+    }
+    $this->redirectChainCache[$initial_cid] = $chain_to_cache;
+
     return $chain;
   }
 
+  /**
+   * Retrieved the redirect chain from cache, validating each part.
+   *
+   * @param string[] $keys
+   *   The cache keys to retrieve the redirect chain for.
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface $initial_cacheability
+   *   The initial cacheability for the redirect chain.
+   *
+   * @return array
+   *   The part of the cached redirect chain, if any, that is still valid.
+   */
+  protected function getValidatedCachedRedirectChain(array $keys, CacheableDependencyInterface $initial_cacheability): array {
+    $cid = $this->createCacheIdFast($keys, $initial_cacheability);
+    if (!isset($this->redirectChainCache[$cid])) {
+      return [];
+    }
+    $chain = $this->redirectChainCache[$cid];
+
+    // Only use that part of the redirect chain that is still valid. Even though
+    // we do not store cache hits in the internal redirect chain cache, we can
+    // still reuse the whole chain up until what would have been a cache hit.
+    //
+    // If part of a redirect chain no longer matches because cache contexts
+    // changed values, we could perhaps still reuse part of the chain until we
+    // encounter a redirect for the changed cache context value.
+    //
+    // There is one special case: If the very last item of the chain is a cache
+    // redirect, and we cannot find anything for it, we still add the redirect
+    // to the validated chain because the only way a cached chain ends in a
+    // redirect is if it led to a cache hit in ::getRedirectChain().
+    $valid_parts = [];
+    $last_key = array_key_last($chain);
+    foreach ($chain as $key => $result) {
+      if ($result && $result->data instanceof CacheRedirect) {
+        $cid = $this->createCacheIdFast($keys, $result->data);
+        if (!isset($chain[$cid]) && $last_key !== $key) {
+          break;
+        }
+      }
+      $valid_parts[$key] = $result;
+    }
+    return $valid_parts;
+  }
+
   /**
    * Maps a max-age value to an "expire" value for the Cache API.
    *
@@ -336,4 +469,15 @@ protected function createCacheIdFast(array $keys, CacheableDependencyInterface $
     return implode(':', $keys);
   }
 
+  /**
+   * Reset statically cached variables.
+   *
+   * This is only used by tests.
+   *
+   * @internal
+   */
+  public function reset(): void {
+    $this->redirectChainCache = [];
+  }
+
 }

core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php

@@ -232,40 +232,10 @@ public function createDuplicate() {
     return $duplicate;
   }
 
-  /**
-   * Sorts entities using collator.
-   */
-  public static function sortEntities(array &$entities): bool {
-    $collator = \Collator::create((!extension_loaded('intl')) ? ('en') : (\Drupal::service('language_manager')->getCurrentLanguage()->getId()));
-    return uasort($entities, function ($a, $b) use ($collator) {
-      return static::compare($a, $b, $collator);
-    });
-  }
-
-  /**
-   * Callback for uasort() to compare configuration entities.
-   */
-  public static function compare(ConfigEntityInterface $a, ConfigEntityInterface $b, \Collator $collator): int {
-    $a_weight = $a->weight ?? 0;
-    $b_weight = $b->weight ?? 0;
-    if ($a_weight == $b_weight) {
-      $a_label = $a->label() ?? '';
-      $b_label = $b->label() ?? '';
-      return $collator->compare($a_label, $b_label);
-    }
-    return $a_weight <=> $b_weight;
-  }
-
   /**
    * Callback for uasort() to sort configuration entities by weight and label.
-   *
-   * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use
-   * \Drupal\Core\Config\Entity\ConfigEntityBase::sortEntities() instead.
-   *
-   * @see https://www.drupal.org/project/drupal/issues/2265487
    */
   public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
-    @trigger_error(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use ' . __CLASS__ . '::sortEntities() instead. See https://www.drupal.org/project/drupal/issues/2265487', E_USER_DEPRECATED);
     $a_weight = $a->weight ?? 0;
     $b_weight = $b->weight ?? 0;
     if ($a_weight == $b_weight) {

core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php

@@ -26,8 +26,9 @@ public function load() {
     $entity_ids = $this->getEntityIds();
     $entities = $this->storage->loadMultipleOverrideFree($entity_ids);
 
-    // Sort the entities using the entity class's sortEntities() method.
-    $this->entityType->getClass()::sortEntities($entities);
+    // Sort the entities using the entity class's sort() method.
+    // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
+    uasort($entities, [$this->entityType->getClass(), 'sort']);
     return $entities;
   }
 

core/lib/Drupal/Core/Database/Query/AlterableInterface.php

@@ -40,28 +40,36 @@ public function hasTag($tag);
    *
    * Each tag to check should be supplied as a separate argument.
    *
-   * @todo Restore PHPDoc of variadic argument in Drupal 8.8, see
-   * https://www.drupal.org/project/drupal/issues/3029729
+   * phpcs:ignore
+   * @param string ...$tags
+   *   A variable number of arguments, one for each tag to check.
    *
    * @return bool
    *   TRUE if this query has been marked with all specified tags, FALSE
    *   otherwise.
+   *
+   * @todo Remove PHPCS ignore and uncomment new method parameters before
+   *   drupal:12.0.0. See https://www.drupal.org/project/drupal/issues/3501046.
    */
-  public function hasAllTags();
+  public function hasAllTags(/* string ...$tags*/);
 
   /**
    * Determines if a given query has any specified tag.
    *
    * Each tag to check should be supplied as a separate argument.
    *
-   * @todo Restore PHPDoc of variadic argument in Drupal 8.8, see
-   * https://www.drupal.org/project/drupal/issues/3029729
+   * phpcs:ignore
+   * @param string ...$tags
+   *   A variable number of arguments, one for each tag to check.
    *
    * @return bool
    *   TRUE if this query has been marked with at least one of the specified
    *   tags, FALSE otherwise.
+   *
+   * @todo Remove PHPCS ignore and uncomment new method parameters before
+   *   drupal:12.0.0. See https://www.drupal.org/project/drupal/issues/3501046.
    */
-  public function hasAnyTag();
+  public function hasAnyTag(/* string ...$tags*/);
 
   /**
    * Adds additional metadata to the query.

core/lib/Drupal/Core/Datetime/Entity/DateFormat.php

@@ -82,27 +82,9 @@ public function isLocked() {
   }
 
   /**
-   * Callback for uasort() to compare configuration entities.
-   */
-  public static function compare(ConfigEntityInterface $a, ConfigEntityInterface $b, \Collator $collator): int {
-    if ($a->isLocked() == $b->isLocked()) {
-      $a_label = $a->label();
-      $b_label = $b->label();
-      return $collator->compare($a_label, $b_label);
-    }
-    return $a->isLocked() ? 1 : -1;
-  }
-
-  /**
-   * Helper callback for uasort() to sort configuration entities.
-   *
-   * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use
-   * \Drupal\Core\Config\Entity\ConfigEntityBase::sortEntities() instead.
-   *
-   * @see https://www.drupal.org/project/drupal/issues/2265487
+   * {@inheritdoc}
    */
   public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
-    @trigger_error(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use ' . __CLASS__ . '::sortEntities() instead. See https://www.drupal.org/project/drupal/issues/2265487', E_USER_DEPRECATED);
     if ($a->isLocked() == $b->isLocked()) {
       $a_label = $a->label();
       $b_label = $b->label();

core/lib/Drupal/Core/Entity/EntityDisplayModeBase.php

@@ -58,28 +58,9 @@ abstract class EntityDisplayModeBase extends ConfigEntityBase implements EntityD
   protected $cache = TRUE;
 
   /**
-   * Callback for uasort() to compare configuration entities.
-   */
-  public static function compare(ConfigEntityInterface $a, ConfigEntityInterface $b, \Collator $collator): int {
-    /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $a */
-    /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $b */
-    // Sort by the type of entity the view mode is used for.
-    $a_type = $a->getTargetType();
-    $b_type = $b->getTargetType();
-    $type_order = $collator->compare($a_type, $b_type);
-    return $type_order != 0 ? $type_order : parent::compare($a, $b, $collator);
-  }
-
-  /**
-   * Helper callback for uasort() to sort configuration entities.
-   *
-   * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use
-   * \Drupal\Core\Config\Entity\ConfigEntityBase::sortEntities() instead.
-   *
-   * @see https://www.drupal.org/project/drupal/issues/2265487
+   * {@inheritdoc}
    */
   public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
-    @trigger_error(__CLASS__ . '::' . __FUNCTION__ . ' is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use ' . __CLASS__ . '::sortEntities() instead. See https://www.drupal.org/project/drupal/issues/2265487', E_USER_DEPRECATED);
     /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $a */
     /** @var \Drupal\Core\Entity\EntityDisplayModeInterface $b */
     // Sort by the type of entity the view mode is used for.

core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php

@@ -106,6 +106,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         ]));
     }
 
+    $form['#attached']['library'][] = 'core/drupal.fieldgroup';
     $form['#attached']['library'][] = 'system/drupal.system';
     // Add JavaScript time zone detection.
     $form['#attached']['library'][] = 'core/drupal.timezone';
@@ -114,7 +115,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['#attached']['drupalSettings']['copyFieldValue']['edit-site-mail'] = ['edit-account-mail'];
 
     $form['site_information'] = [
-      '#type' => 'fieldgroup',
+      '#type' => 'fieldset',
+      '#attributes' => ['class' => ['fieldgroup']],
       '#title' => $this->t('Site information'),
       '#access' => empty($install_state['config_install_path']),
     ];
@@ -146,7 +148,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     }
 
     $form['admin_account'] = [
-      '#type' => 'fieldgroup',
+      '#type' => 'fieldset',
+      '#attributes' => ['class' => ['fieldgroup']],
       '#title' => $account_label,
     ];
     $form['admin_account']['account']['name'] = [
@@ -170,7 +173,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     ];
 
     $form['regional_settings'] = [
-      '#type' => 'fieldgroup',
+      '#type' => 'fieldset',
+      '#attributes' => ['class' => ['fieldgroup']],
       '#title' => $this->t('Regional settings'),
       '#access' => empty($install_state['config_install_path']),
     ];
@@ -189,7 +193,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     ];
 
     $form['update_notifications'] = [
-      '#type' => 'fieldgroup',
+      '#type' => 'fieldset',
+      '#attributes' => ['class' => ['fieldgroup']],
       '#title' => $this->t('Update notifications'),
       '#description' => $this->t('When checking for updates, your site automatically sends anonymous information to Drupal.org. See the <a href="@update-module-docs" target="_blank">Update module documentation</a> for details.', ['@update-module-docs' => 'https://www.drupal.org/node/178772']),
       '#access' => empty($install_state['config_install_path']),

core/lib/Drupal/Core/Render/Element/Fieldgroup.php

@@ -15,10 +15,23 @@
  *
  * @see \Drupal\Core\Render\Element\Fieldset
  * @see \Drupal\Core\Render\Element\Details
+ *
+ * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0.
+ *    Use \Drupal\Core\Render\Element\Fieldset instead.
+ *
+ * @see https://www.drupal.org/node/3515272
  */
 #[RenderElement('fieldgroup')]
 class Fieldgroup extends Fieldset {
 
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    @trigger_error('The ' . __CLASS__ . ' element is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use ' . Fieldset::class . ' instead. See https://www.drupal.org/node/3515272', E_USER_DEPRECATED);
+  }
+
   public function getInfo() {
     $info = parent::getInfo();
     $info['#attributes']['class'] = ['fieldgroup'];

core/lib/Drupal/Core/Theme/Component/ComponentValidator.php

@@ -123,6 +123,7 @@ public function validateDefinition(array $definition, bool $enforce_schemas): bo
     );
 
     $definition_object = Validator::arrayToObjectRecursive($definition);
+    $this->validator->reset();
     $this->validator->validate(
       $definition_object,
       (object) ['$ref' => 'file://' . dirname(__DIR__, 5) . '/assets/schemas/v1/metadata-full.schema.json']
@@ -188,15 +189,15 @@ public function validateProps(array $context, Component $component): bool {
     ] = $this->validateClassProps($schema, $props_raw, $component_id);
     $schema = Validator::arrayToObjectRecursive($schema);
     $props = Validator::arrayToObjectRecursive($props_raw);
-    $validator = new Validator();
-    $validator->validate($props, $schema, Constraint::CHECK_MODE_TYPE_CAST);
-    $validator->getErrors();
-    if ($validator->isValid()) {
+    $this->validator->reset();
+    $this->validator->validate($props, $schema, Constraint::CHECK_MODE_TYPE_CAST);
+    $this->validator->getErrors();
+    if ($this->validator->isValid()) {
       return TRUE;
     }
     // Dismiss type errors if the prop received a render array.
     $errors = array_filter(
-      $validator->getErrors(),
+      $this->validator->getErrors(),
       function (array $error) use ($context): bool {
         if (($error['constraint'] ?? '') !== 'type') {
           return TRUE;

core/misc/autocomplete.js

@@ -78,8 +78,8 @@
     }
 
     const term = autocomplete.extractLastTerm(event.target.value);
-    // Abort search if the first character is in firstCharacterBlacklist.
-    if (term.length > 0 && options.firstCharacterBlacklist.includes(term[0])) {
+    // Abort search if the first character is in firstCharacterDenyList.
+    if (term.length > 0 && options.firstCharacterDenyList.includes(term[0])) {
       return false;
     }
     // Only search when the term is at least the minimum length.
@@ -215,8 +215,23 @@
           const blacklist = $autocomplete.attr(
             'data-autocomplete-first-character-blacklist',
           );
+          if (blacklist !== undefined) {
+            Drupal.deprecationError({
+              message:
+                'The data-autocomplete-first-character-blocklist attribute is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use firstCharacterDenyList instead. See https://www.drupal.org/node/3472016.',
+            });
+          }
+          const denyList = $autocomplete.attr(
+            'data-autocomplete-first-character-denylist',
+          );
+          Drupal.deprecatedProperty({
+            target: autocomplete.options,
+            deprecatedProperty: 'firstCharacterBlacklist',
+            message:
+              'The firstCharacterBlacklist property is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use firstCharacterDenyList instead. See https://www.drupal.org/node/3472016.',
+          });
           $.extend(autocomplete.options, {
-            firstCharacterBlacklist: blacklist || '',
+            firstCharacterDenyList: denyList || blacklist,
           });
           // Use jQuery UI Autocomplete on the textfield.
           $autocomplete.autocomplete(autocomplete.options).each(function () {
@@ -268,7 +283,7 @@
       renderItem,
       minLength: 1,
       // Custom options, used by Drupal.autocomplete.
-      firstCharacterBlacklist: '',
+      firstCharacterDenyList: '',
       // Custom options, indicate IME usage status.
       isComposing: false,
     },

core/misc/dialog/dialog-deprecation.js

@@ -36,5 +36,23 @@
       'dialog:beforeclose',
       'dialog:afterclose',
     ].forEach((e) => window.addEventListener(e, listenDialogEvent));
+
+    window.addEventListener('dialog:beforecreate', (event) => {
+      const dialog = event.target;
+      $(dialog).on('dialogButtonsChange.dialogDeprecation', (e) => {
+        // If triggered by jQuery.
+        if (!e?.originalEvent) {
+          Drupal.deprecationError({
+            message: `jQuery event dialogButtonsChange is deprecated in 11.2.0 and is removed from Drupal:12.0.0. See https://www.drupal.org/node/3464202`,
+          });
+          dialog.dispatchEvent(new CustomEvent('dialogButtonsChange'));
+        }
+      });
+    });
+
+    window.addEventListener('dialog:beforeclose', (event) => {
+      const dialog = event.target;
+      $(dialog).off(`dialogButtonsChange.dialogDeprecation`);
+    });
   }
 })(jQuery, Drupal, once);

core/misc/dialog/dialog.ajax.js

@@ -14,40 +14,41 @@
    */
   Drupal.behaviors.dialog = {
     attach(context, settings) {
-      const $context = $(context);
-
       // Provide a known 'drupal-modal' DOM element for Drupal-based modal
       // dialogs. Non-modal dialogs are responsible for creating their own
       // elements, since there can be multiple non-modal dialogs at a time.
-      if (!$('#drupal-modal').length) {
+      if (!document.querySelector('#drupal-modal')) {
         // Add 'ui-front' jQuery UI class so jQuery UI widgets like autocomplete
         // sit on top of dialogs. For more information see
         // http://api.jqueryui.com/theming/stacking-elements/.
-        $('<div id="drupal-modal" class="ui-front"></div>')
-          .hide()
-          .appendTo('body');
+        document.body.insertAdjacentHTML(
+          'beforeend',
+          '<div id="drupal-modal" class="ui-front" style="display:none"></div>',
+        );
       }
 
       // Special behaviors specific when attaching content within a dialog.
       // These behaviors usually fire after a validation error inside a dialog.
-      const $dialog = $context.closest('.ui-dialog-content');
-      if ($dialog.length) {
-        // Remove and replace the dialog buttons with those from the new form.
-        if ($dialog.dialog('option', 'drupalAutoButtons')) {
-          // Trigger an event to detect/sync changes to buttons.
-          $dialog.trigger('dialogButtonsChange');
-        }
-
-        setTimeout(function () {
-          // Account for pre-existing focus handling that may have already moved
-          // the focus inside the dialog.
-          if (!$dialog[0].contains(document.activeElement)) {
-            // Move focus to the first focusable element in the next event loop
-            // to allow dialog buttons to be changed first.
-            $dialog.dialog('instance')._focusedElement = null;
-            $dialog.dialog('instance')._focusTabbable();
+      if (context !== document) {
+        const dialog = context.closest('.ui-dialog-content');
+        if (dialog) {
+          // Remove and replace the dialog buttons with those from the new form.
+          if ($(dialog).dialog('option', 'drupalAutoButtons')) {
+            // Trigger an event to detect/sync changes to buttons.
+            dialog.dispatchEvent(new CustomEvent('dialogButtonsChange'));
           }
-        }, 0);
+
+          setTimeout(function () {
+            // Account for pre-existing focus handling that may have already moved
+            // the focus inside the dialog.
+            if (!dialog.contains(document.activeElement)) {
+              // Move focus to the first focusable element in the next event loop
+              // to allow dialog buttons to be changed first.
+              $(dialog).dialog('instance')._focusedElement = null;
+              $(dialog).dialog('instance')._focusTabbable();
+            }
+          }, 0);
+        }
       }
 
       const originalClose = settings.dialog.close;
@@ -77,7 +78,6 @@
             }, 0);
           }
         }
-
         $(event.target).remove();
       };
     },
@@ -93,26 +93,23 @@
      */
     prepareDialogButtons($dialog) {
       const buttons = [];
-      const $buttons = $dialog.find(
-        '.form-actions input[type=submit], .form-actions a.button, .form-actions a.action-link',
-      );
-      $buttons.each(function () {
-        const $originalButton = $(this);
-        this.style.display = 'none';
+      const buttonSelectors =
+        '.form-actions input[type=submit], .form-actions a.button, .form-actions a.action-link';
+      const buttonElements = $dialog[0].querySelectorAll(buttonSelectors);
+
+      buttonElements.forEach((button) => {
+        button.style.display = 'none';
         buttons.push({
-          text: $originalButton.html() || $originalButton.attr('value'),
-          class: $originalButton.attr('class'),
-          'data-once': $originalButton.data('once'),
+          text: button.innerHTML || button.getAttribute('value'),
+          class: button.getAttribute('class'),
+          'data-once': button.dataset.once,
           click(e) {
-            // If the original button is an anchor tag, triggering the "click"
-            // event will not simulate a click. Use the click method instead.
-            if ($originalButton[0].tagName === 'A') {
-              $originalButton[0].click();
+            if (button.tagName === 'A') {
+              button.click();
             } else {
-              $originalButton
-                .trigger('mousedown')
-                .trigger('mouseup')
-                .trigger('click');
+              ['mousedown', 'mouseup', 'click'].forEach((event) =>
+                button.dispatchEvent(new MouseEvent(event)),
+              );
             }
             e.preventDefault();
           },
@@ -139,19 +136,17 @@
     if (!response.selector) {
       return false;
     }
-    let $dialog = $(response.selector);
-    if (!$dialog.length) {
+    let dialog = document.querySelector(response.selector);
+    if (!dialog) {
       // Create the element if needed.
-      $dialog = $(
-        `<div id="${response.selector.replace(
-          /^#/,
-          '',
-        )}" class="ui-front"></div>`,
-      ).appendTo('body');
+      dialog = document.createElement('div');
+      dialog.id = response.selector.replace(/^#/, '');
+      dialog.classList.add('ui-front');
+      document.body.appendChild(dialog);
     }
     // Set up the wrapper, if there isn't one.
     if (!ajax.wrapper) {
-      ajax.wrapper = $dialog.attr('id');
+      ajax.wrapper = dialog.id;
     }
 
     // Use the ajax.js insert command to populate the dialog contents.
@@ -174,26 +169,32 @@
       response.dialogOptions.drupalAutoButtons
     ) {
       response.dialogOptions.buttons =
-        Drupal.behaviors.dialog.prepareDialogButtons($dialog);
+        Drupal.behaviors.dialog.prepareDialogButtons($(dialog));
     }
 
+    const dialogButtonsChange = () => {
+      const buttons = Drupal.behaviors.dialog.prepareDialogButtons($(dialog));
+      $(dialog).dialog('option', 'buttons', buttons);
+    };
+
     // Bind dialogButtonsChange.
-    $dialog.on('dialogButtonsChange', () => {
-      const buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
-      $dialog.dialog('option', 'buttons', buttons);
+    dialog.addEventListener('dialogButtonsChange', dialogButtonsChange);
+    dialog.addEventListener('dialog:beforeclose', (event) => {
+      dialog.removeEventListener('dialogButtonsChange', dialogButtonsChange);
     });
 
     // Open the dialog itself.
-    response.dialogOptions = response.dialogOptions || {};
-    const dialog = Drupal.dialog($dialog.get(0), response.dialogOptions);
+    const createdDialog = Drupal.dialog(dialog, response.dialogOptions);
     if (response.dialogOptions.modal) {
-      dialog.showModal();
+      createdDialog.showModal();
     } else {
-      dialog.show();
+      createdDialog.show();
     }
 
     // Add the standard Drupal class for buttons for style consistency.
-    $dialog.parent().find('.ui-dialog-buttonset').addClass('form-actions');
+    dialog.parentElement
+      ?.querySelector('.ui-dialog-buttonset')
+      ?.classList.add('form-actions');
   };
 
   /**
@@ -217,16 +218,13 @@
     response,
     status,
   ) {
-    const $dialog = $(response.selector);
-    if ($dialog.length) {
-      Drupal.dialog($dialog.get(0)).close();
+    const dialog = document.querySelector(response.selector);
+    if (dialog) {
+      Drupal.dialog(dialog).close();
       if (!response.persist) {
-        $dialog.remove();
+        dialog.remove();
       }
     }
-
-    // Unbind dialogButtonsChange.
-    $dialog.off('dialogButtonsChange');
   };
 
   /**
@@ -252,47 +250,32 @@
     response,
     status,
   ) {
-    const $dialog = $(response.selector);
-    if ($dialog.length) {
-      $dialog.dialog('option', response.optionName, response.optionValue);
+    const dialog = document.querySelector(response.selector);
+    if (dialog) {
+      $(dialog).dialog('option', response.optionName, response.optionValue);
     }
   };
 
   /**
    * Binds a listener on dialog creation to handle the cancel link.
    *
-   * @param {jQuery.Event} e
+   * @param {DrupalDialogEvent} e
    *   The event triggered.
    * @param {Drupal.dialog~dialogDefinition} dialog
    *   The dialog instance.
-   * @param {jQuery} $element
-   *   The jQuery collection of the dialog element.
    * @param {object} [settings]
    *   Dialog settings.
    */
   window.addEventListener('dialog:aftercreate', (event) => {
-    const $element = $(event.target);
     const dialog = event.dialog;
-    $element.on('click.dialog', '.dialog-cancel', (e) => {
+    const cancelButton = event.target.querySelector('.dialog-cancel');
+    const cancelClick = (e) => {
       dialog.close('cancel');
       e.preventDefault();
       e.stopPropagation();
-    });
-  });
-
-  /**
-   * Removes all 'dialog' listeners.
-   *
-   * @param {jQuery.Event} e
-   *   The event triggered.
-   * @param {Drupal.dialog~dialogDefinition} dialog
-   *   The dialog instance.
-   * @param {jQuery} $element
-   *   jQuery collection of the dialog element.
-   */
-  window.addEventListener('dialog:beforeclose', (e) => {
-    const $element = $(e.target);
-    $element.off('.dialog');
+    };
+    cancelButton?.removeEventListener('click', cancelClick);
+    cancelButton?.addEventListener('click', cancelClick);
   });
 
   /**