composer/Plugin/Scaffold/Operations/AppendOp.php

@@ -41,11 +41,15 @@ class AppendOp extends AbstractOperation {
 
   /**
    * An indicator of whether the file we are appending to is managed or not.
+   *
+   * @var bool
    */
   protected $managed;
 
   /**
    * An indicator of whether we are allowed to append to a non-scaffolded file.
+   *
+   * @var bool
    */
   protected $forceAppend;
 
@@ -59,16 +63,21 @@ class AppendOp extends AbstractOperation {
   /**
    * Constructs an AppendOp.
    *
-   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $prepend_path
-   *   The relative path to the prepend file.
-   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $append_path
-   *   The relative path to the append file.
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $prepend_path
+   *   (optional) The relative path to the prepend file.
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $append_path
+   *   (optional) The relative path to the append file.
    * @param bool $force_append
-   *   TRUE if is okay to append to a file that was not scaffolded.
-   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $default_path
-   *   The relative path to the default data.
+   *   (optional) TRUE if is okay to append to a file that was not scaffolded.
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $default_path
+   *   (optional) The relative path to the default data.
    */
-  public function __construct(ScaffoldFilePath $prepend_path = NULL, ScaffoldFilePath $append_path = NULL, $force_append = FALSE, ScaffoldFilePath $default_path = NULL) {
+  public function __construct(
+    ?ScaffoldFilePath $prepend_path = NULL,
+    ?ScaffoldFilePath $append_path = NULL,
+    $force_append = FALSE,
+    ?ScaffoldFilePath $default_path = NULL,
+  ) {
     $this->forceAppend = $force_append;
     $this->prepend = $prepend_path;
     $this->append = $append_path;
@@ -190,7 +199,7 @@ public function scaffoldAtNewLocation(ScaffoldFilePath $destination) {
    * @param string $contents
    *   The contents of the target file.
    * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $data_path
-   *   The path to the data to append or prepend
+   *   The path to the data to append or prepend.
    *
    * @return bool
    *   'TRUE' if the append/prepend data already exists in contents.

composer/Plugin/Scaffold/Operations/OperationFactory.php

@@ -122,13 +122,13 @@ protected function createAppendOp(PackageInterface $package, OperationData $oper
   /**
    * Checks to see if the specified scaffold file exists and has content.
    *
-   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
-   *   Scaffold file to check.
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $file
+   *   (optional) Scaffold file to check.
    *
    * @return bool
    *   True if the file exists and has content.
    */
-  protected function hasContent(ScaffoldFilePath $file = NULL) {
+  protected function hasContent(?ScaffoldFilePath $file = NULL) {
     if (!$file) {
       return FALSE;
     }

composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php

@@ -77,7 +77,7 @@ public function __construct(array $file_mappings, Interpolator $location_replace
    * Matching is done via destination path.
    *
    * @param string[] $files_to_filter
-   *   List of destination paths
+   *   List of destination paths.
    */
   public function filterFiles(array $files_to_filter) {
     foreach ($this->scaffoldFilesByProject as $project_name => $scaffold_files) {
@@ -97,7 +97,7 @@ public function filterFiles(array $files_to_filter) {
    * Scans through a list of scaffold files and determines if any has contents.
    *
    * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[] $scaffold_files
-   *   List of scaffold files, path: ScaffoldFileInfo
+   *   List of scaffold files, path: ScaffoldFileInfo.
    *
    * @return bool
    *   TRUE if at least one item in the list has content
@@ -115,8 +115,7 @@ protected function checkListHasItemWithContent(array $scaffold_files) {
   /**
    * {@inheritdoc}
    */
-  #[\ReturnTypeWillChange]
-  public function getIterator() {
+  public function getIterator(): \ArrayIterator {
     return new \ArrayIterator($this->scaffoldFilesByProject);
   }
 

composer/Plugin/Scaffold/Plugin.php

@@ -47,7 +47,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface, Capable {
   /**
    * Record whether the 'require' command was called.
    *
-   * @param bool
+   * @var bool
    */
   protected $requireWasCalled;
 

composer/Plugin/Scaffold/README.md

@@ -389,7 +389,7 @@ Sample composer.json for a project that relies on packages that use composer-sca
   "name": "my/project",
   "require": {
     "drupal/core-composer-scaffold": "*",
-    "composer/installers": "^2.0",
+    "composer/installers": "^2.3",
     "cweagans/composer-patches": "^1.6.5",
     "drupal/core": "^8.8.x-dev",
     "service-provider/d8-scaffold-files": "^1"
@@ -450,7 +450,6 @@ Sample composer.json for composer-scaffold files in drupal/assets:
         "[web-root]/index.php": "assets/index.php",
         "[web-root]/robots.txt": "assets/robots.txt",
         "[web-root]/update.php": "assets/update.php",
-        "[web-root]/web.config": "assets/web.config"
       }
     }
   }

composer/Plugin/Scaffold/ScaffoldFileInfo.php

@@ -127,6 +127,7 @@ public function process(IOInterface $io, ScaffoldOptions $options) {
    * Returns TRUE if the target does not exist or has changed.
    *
    * @return bool
+   *   TRUE if the target does not exist or has changed, FALSE otherwise.
    */
   final public function hasChanged() {
     $path = $this->destination()->fullPath();

composer/Plugin/VendorHardening/Config.php

@@ -22,7 +22,6 @@ class Config {
   protected static $defaultConfig = [
     'behat/mink' => ['tests'],
     'behat/mink-browserkit-driver' => ['tests'],
-    'behat/mink-selenium2-driver' => ['tests'],
     'composer/composer' => ['bin'],
     'drupal/coder' => [
       'coder_sniffer/Drupal/Test',
@@ -32,8 +31,9 @@ class Config {
     'egulias/email-validator' => ['documentation', 'tests'],
     'guzzlehttp/promises' => ['tests'],
     'guzzlehttp/psr7' => ['tests'],
-    'instaclick/php-webdriver' => ['doc', 'test'],
     'justinrainbow/json-schema' => ['demo'],
+    'lullabot/mink-selenium2-driver' => ['tests'],
+    'lullabot/php-webdriver' => ['doc', 'test'],
     'masterminds/html5' => ['bin', 'test'],
     'mck89/peast' => ['doc'],
     'mikey179/vfsstream' => ['src/test'],
@@ -70,7 +70,6 @@ class Config {
     'symfony/event-dispatcher' => ['Tests'],
     'symfony/http-foundation' => ['Tests'],
     'symfony/http-kernel' => ['Tests'],
-    'symfony/phpunit-bridge' => ['Tests'],
     'symfony/process' => ['Tests'],
     'symfony/psr-http-message-bridge' => ['Tests'],
     'symfony/routing' => ['Tests'],
@@ -78,6 +77,7 @@ class Config {
     'symfony/var-dumper' => ['Tests'],
     'symfony/validator' => ['Tests', 'Resources'],
     'symfony/yaml' => ['Tests'],
+    'tbachert/spi' => ['tests'],
     'theseer/tokenizer' => ['tests'],
     'twig/twig' => ['doc', 'ext', 'test', 'tests'],
   ];

composer/Plugin/VendorHardening/FileSecurity.php

@@ -43,7 +43,7 @@ public static function writeHtaccess($directory, $deny_public_access = TRUE, $fo
    * @return string
    *   The desired contents of the .htaccess file.
    *
-   * @see file_save_htaccess()
+   * @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess()
    */
   public static function htaccessLines($deny_public_access = TRUE) {
     $lines = static::htaccessPreventExecution();
@@ -100,39 +100,6 @@ protected static function denyPublicAccess() {
 EOF;
   }
 
-  /**
-   * Writes a web.config file in the given directory, if it doesn't exist.
-   *
-   * @param string $directory
-   *   The directory.
-   * @param bool $force
-   *   (optional) Set to TRUE to force overwrite an existing file.
-   *
-   * @return bool
-   *   TRUE if the file already exists or was created. FALSE otherwise.
-   */
-  public static function writeWebConfig($directory, $force = FALSE) {
-    return self::writeFile($directory, 'web.config', self::webConfigLines(), $force);
-  }
-
-  /**
-   * Returns the standard web.config lines for security.
-   *
-   * @return string
-   *   The contents of the web.config file.
-   */
-  public static function webConfigLines() {
-    return <<<EOT
-<configuration>
-  <system.webServer>
-    <authorization>
-      <deny users="*">
-    </authorization>
-  </system.webServer>
-</configuration>
-EOT;
-  }
-
   /**
    * Writes the contents to the file in the given directory.
    *

composer/Plugin/VendorHardening/README.txt

@@ -35,9 +35,9 @@ This plugin can also clean up packages that were installed outside of the
 vendor directory, using composer/installers. This allows users to configure the
 plugin to clean up, for instance, Drupal extensions and Drupal core.
 
-2) The plugin also adds .htaccess and web.config files to the root of the
-project's vendor directory. These files will perform due diligence to keep the
-web server from serving files from within the vendor directory.
+2) The plugin also adds .htaccess file to the root of the
+project's vendor directory. The file will perform due diligence to keep the
+web server from serving file from within the vendor directory.
 
 How do I set it up?
 -------------------

composer/Plugin/VendorHardening/VendorHardeningPlugin.php

 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Composer\Plugin\VendorHardening;
 
 use Composer\Composer;
@@ -58,7 +60,7 @@ class VendorHardeningPlugin implements PluginInterface, EventSubscriberInterface
   /**
    * {@inheritdoc}
    */
-  public function activate(Composer $composer, IOInterface $io) {
+  public function activate(Composer $composer, IOInterface $io): void {
     $this->composer = $composer;
     $this->io = $io;
 
@@ -69,19 +71,19 @@ public function activate(Composer $composer, IOInterface $io) {
   /**
    * {@inheritdoc}
    */
-  public function deactivate(Composer $composer, IOInterface $io) {
+  public function deactivate(Composer $composer, IOInterface $io): void {
   }
 
   /**
    * {@inheritdoc}
    */
-  public function uninstall(Composer $composer, IOInterface $io) {
+  public function uninstall(Composer $composer, IOInterface $io): void {
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       ScriptEvents::POST_AUTOLOAD_DUMP => 'onPostAutoloadDump',
       ScriptEvents::POST_UPDATE_CMD => 'onPostCmd',
@@ -99,7 +101,7 @@ public static function getSubscribedEvents() {
    * @param \Composer\Script\Event $event
    *   The Composer event.
    */
-  public function onPostAutoloadDump(Event $event) {
+  public function onPostAutoloadDump(Event $event): void {
     $this->writeAccessRestrictionFiles($this->composer->getConfig()->get('vendor-dir'));
   }
 
@@ -109,7 +111,7 @@ public function onPostAutoloadDump(Event $event) {
    * @param \Composer\Script\Event $event
    *   The Composer event.
    */
-  public function onPostCmd(Event $event) {
+  public function onPostCmd(Event $event): void {
     $this->cleanAllPackages();
   }
 
@@ -119,7 +121,7 @@ public function onPostCmd(Event $event) {
    * @param \Composer\Installer\PackageEvent $event
    *   The package event.
    */
-  public function onPrePackageInstall(PackageEvent $event) {
+  public function onPrePackageInstall(PackageEvent $event): void {
     /** @var \Composer\Package\CompletePackage $package */
     $package = $event->getOperation()->getPackage();
     $this->removeBinBeforeCleanup($package);
@@ -131,7 +133,7 @@ public function onPrePackageInstall(PackageEvent $event) {
    * @param \Composer\Installer\PackageEvent $event
    *   The package event.
    */
-  public function onPrePackageUpdate(PackageEvent $event) {
+  public function onPrePackageUpdate(PackageEvent $event): void {
     /** @var \Composer\Package\CompletePackage $package */
     $package = $event->getOperation()->getTargetPackage();
     $this->removeBinBeforeCleanup($package);
@@ -143,7 +145,7 @@ public function onPrePackageUpdate(PackageEvent $event) {
    * @param \Composer\Installer\PackageEvent $event
    *   The package event.
    */
-  public function onPostPackageInstall(PackageEvent $event) {
+  public function onPostPackageInstall(PackageEvent $event): void {
     $this->cleanPackage($event->getOperation()->getPackage());
   }
 
@@ -153,7 +155,7 @@ public function onPostPackageInstall(PackageEvent $event) {
    * @param \Composer\Installer\PackageEvent $event
    *   The package event.
    */
-  public function onPostPackageUpdate(PackageEvent $event) {
+  public function onPostPackageUpdate(PackageEvent $event): void {
     $this->cleanPackage($event->getOperation()->getTargetPackage());
   }
 
@@ -166,7 +168,7 @@ public function onPostPackageUpdate(PackageEvent $event) {
    * @param \Composer\Package\BasePackage $package
    *   The package we're cleaning up.
    */
-  protected function removeBinBeforeCleanup(BasePackage $package) {
+  protected function removeBinBeforeCleanup(BasePackage $package): void {
     // We can process AliasPackage and Package objects, and they share the
     // BasePackage parent class. However, since there is no common interface for
     // these package types that allow for the setBinaries() method, and since
@@ -208,7 +210,7 @@ protected function removeBinBeforeCleanup(BasePackage $package) {
    * @return string[]
    *   Bin files to remove, with the file as both the key and the value.
    */
-  protected function findBinOverlap($binaries, $clean_paths) {
+  protected function findBinOverlap(array $binaries, array $clean_paths): array {
     // Make a filesystem model to explore. This is a keyed array that looks like
     // all the places that will be removed by cleanup. 'tests/src' becomes
     // $filesystem['tests']['src'] = TRUE;
@@ -250,7 +252,7 @@ protected function findBinOverlap($binaries, $clean_paths) {
    * @return \Composer\Package\PackageInterface[]
    *   The list of installed packages.
    */
-  protected function getInstalledPackages() {
+  protected function getInstalledPackages(): array {
     return $this->composer->getRepositoryManager()->getLocalRepository()->getPackages();
   }
 
@@ -264,7 +266,7 @@ protected function getInstalledPackages() {
    *   Path to the install path for the package, relative to the project. This
    *   accounts for changes made by composer/installers, if any.
    */
-  protected function getInstallPathForPackage(PackageInterface $package) {
+  protected function getInstallPathForPackage(PackageInterface $package): string {
     return $this->composer->getInstallationManager()->getInstallPath($package);
   }
 
@@ -273,7 +275,7 @@ protected function getInstallPathForPackage(PackageInterface $package) {
    *
    * This applies in the context of a post-command event.
    */
-  public function cleanAllPackages() {
+  public function cleanAllPackages(): void {
     // Get a list of all the packages available after the update or install
     // command.
     $installed_packages = [];
@@ -309,7 +311,7 @@ public function cleanAllPackages() {
    * @param \Composer\Package\PackageInterface $package
    *   The package to clean.
    */
-  public function cleanPackage(PackageInterface $package) {
+  public function cleanPackage(PackageInterface $package): void {
     // Normalize package names to lower case.
     $package_name = strtolower($package->getName());
     if (isset($this->packagesAlreadyCleaned[$package_name])) {
@@ -329,10 +331,10 @@ public function cleanPackage(PackageInterface $package) {
    *
    * @param \Composer\Package\PackageInterface $package
    *   The package to clean.
-   * @param string $paths_for_package
-   *   List of directories in $package_name to remove
+   * @param string[] $paths_for_package
+   *   List of directories in $package_name to remove.
    */
-  protected function cleanPathsForPackage(PackageInterface $package, $paths_for_package) {
+  protected function cleanPathsForPackage(PackageInterface $package, $paths_for_package): void {
     // Whatever happens here, this package counts as cleaned so that we don't
     // process it more than once.
     $package_name = strtolower($package->getName());
@@ -343,43 +345,40 @@ protected function cleanPathsForPackage(PackageInterface $package, $paths_for_pa
       return;
     }
 
-    $this->io->writeError(sprintf('%sCleaning directories in <comment>%s</comment>', str_repeat(' ', 4), $package_name), TRUE, IOInterface::VERY_VERBOSE);
+    $this->io->writeError(sprintf('%sCleaning paths in <comment>%s</comment>', str_repeat(' ', 4), $package_name), TRUE, IOInterface::VERY_VERBOSE);
     $fs = new Filesystem();
     foreach ($paths_for_package as $cleanup_item) {
       $cleanup_path = $package_dir . '/' . $cleanup_item;
-      if (!is_dir($cleanup_path)) {
+      if (!file_exists($cleanup_path)) {
         // If the package has changed or the --prefer-dist version does not
         // include the directory. This is not an error.
-        $this->io->writeError(sprintf("%s<comment>Directory '%s' does not exist.</comment>", str_repeat(' ', 6), $cleanup_path), TRUE, IOInterface::VERY_VERBOSE);
+        $this->io->writeError(sprintf("%s<comment>Path '%s' does not exist.</comment>", str_repeat(' ', 6), $cleanup_path), TRUE, IOInterface::VERY_VERBOSE);
         continue;
       }
 
-      if (!$fs->removeDirectory($cleanup_path)) {
+      if (!$fs->remove($cleanup_path)) {
         // Always display a message if this fails as it means something
         // has gone wrong. Therefore the message has to include the
         // package name as the first informational message might not
         // exist.
-        $this->io->writeError(sprintf("%s<error>Failure removing directory '%s'</error> in package <comment>%s</comment>.", str_repeat(' ', 6), $cleanup_item, $package_name), TRUE, IOInterface::NORMAL);
+        $this->io->writeError(sprintf("%s<error>Failure removing path '%s'</error> in package <comment>%s</comment>.", str_repeat(' ', 6), $cleanup_item, $package_name), TRUE, IOInterface::NORMAL);
         continue;
       }
 
-      $this->io->writeError(sprintf("%sRemoving directory <info>'%s'</info>", str_repeat(' ', 4), $cleanup_item), TRUE, IOInterface::VERBOSE);
+      $this->io->writeError(sprintf("%sRemoving path <info>'%s'</info>", str_repeat(' ', 4), $cleanup_item), TRUE, IOInterface::VERBOSE);
     }
   }
 
   /**
-   * Place .htaccess and web.config files into the vendor directory.
+   * Place .htaccess file into the vendor directory.
    *
    * @param string $vendor_dir
    *   Path to vendor directory.
    */
-  public function writeAccessRestrictionFiles($vendor_dir) {
-    $this->io->writeError('<info>Hardening vendor directory with .htaccess and web.config files.</info>');
+  public function writeAccessRestrictionFiles(string $vendor_dir): void {
+    $this->io->writeError('<info>Hardening vendor directory with .htaccess file.</info>');
     // Prevent access to vendor directory on Apache servers.
     FileSecurity::writeHtaccess($vendor_dir, TRUE);
-
-    // Prevent access to vendor directory on IIS servers.
-    FileSecurity::writeWebConfig($vendor_dir);
   }
 
 }

composer/Template/LegacyProject/composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "composer/installers": "^2.0",
+        "composer/installers": "^2.3",
         "drupal/core-composer-scaffold": "^11",
         "drupal/core-project-message": "^11",
         "drupal/core-recommended": "^11",

composer/Template/README.txt

@@ -63,4 +63,4 @@ These template projects use drupal/core-composer-scaffold to place the scaffold
 files. This plugin allows the top-level composer.json file for a Drupal site to
 transform the scaffold files in different ways, e.g. to append new entries to
 the end of robots.txt and so on. For documentation on how scaffolding works, see
-https://git.drupalcode.org/project/drupal/tree/8.8.x/composer/Plugin/Scaffold
+https://www.drupal.org/docs/develop/using-composer/using-drupals-composer-scaffold

composer/Template/RecommendedProject/composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "composer/installers": "^2.0",
+        "composer/installers": "^2.3",
         "drupal/core-composer-scaffold": "^11",
         "drupal/core-project-message": "^11",
         "drupal/core-recommended": "^11"
@@ -54,7 +54,8 @@
             "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
             "web/modules/custom/{$name}": ["type:drupal-custom-module"],
             "web/profiles/custom/{$name}": ["type:drupal-custom-profile"],
-            "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
+            "web/themes/custom/{$name}": ["type:drupal-custom-theme"],
+            "recipes/{$name}": ["type:drupal-recipe"]
         },
         "drupal-core-project-message": {
             "include-keys": ["homepage", "support"],

core/.cspell.json

@@ -8,34 +8,33 @@
       ".*ignore",
       "composer.lock",
       "assets/vendor/**",
+      "misc/jquery.form.js",
       "lib/Drupal/Component/Diff/**",
       "lib/Drupal/Component/Transliteration/data/**",
       "lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php",
       "**/LICENSE.txt",
       "../**/LICENSE.txt",
       "modules/**/Migrate*Test.php",
-      "modules/book/tests/fixtures/drupal6.php",
-      "modules/book/tests/fixtures/drupal7.php",
       "modules/ckeditor5/js/build/*",
-      "modules/forum/tests/fixtures/drupal6.php",
-      "modules/forum/tests/fixtures/drupal7.php",
       "modules/media/tests/fixtures/oembed/*",
       "modules/migrate_drupal/tests/fixtures/drupal6.php",
       "modules/migrate_drupal/tests/fixtures/drupal7.php",
+      "modules/navigation/assets/**",
       "modules/search/tests/UnicodeTest.txt",
-      "modules/statistics/tests/fixtures/drupal6.php",
-      "modules/statistics/tests/fixtures/drupal7.php",
       "modules/system/tests/logo.svgz",
-      "modules/tracker/tests/fixtures/drupal7.php",
       "node_modules/*",
       "profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/**/*",
+      "tests/fixtures/config_install/*",
       "tests/fixtures/files/*",
       "tests/Drupal/Tests/Component/Annotation/Doctrine/**",
+      "tests/PHPStan/vendor/**",
       "themes/olivero/fonts/**",
       "COPYRIGHT.txt",
       "MAINTAINERS.txt",
       "package.json",
       "yarn.lock",
+      ".yarnrc.yml",
+      ".yarn/*",
       "misc/cspell/dictionary.txt",
       "phpstan*"
     ],
@@ -71,7 +70,8 @@
       "hte",
       "ist",
       "please",
-      "queuing"
+      "queuing",
+      "writeable"
     ],
     "overrides": [
       {

core/.deprecation-ignore.txt

@@ -3,12 +3,9 @@
 # See https://www.drupal.org/node/3285162 for more details.
 
 %The "Symfony\\Component\\Validator\\Context\\ExecutionContextInterface::.*\(\)" method is considered internal Used by the validator engine\. (Should not be called by user\W+code\. )?It may change without further notice\. You should not extend it from "[^"]+"\.%
-%The "PHPUnit\\Framework\\TestCase::addWarning\(\)" method is considered internal%
 
 # Skip some dependencies' DebugClassLoader forward compatibility warnings.
 %Method "Behat\\[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
-%Method "Composer\\EventDispatcher\\EventSubscriberInterface::getSubscribedEvents\(\)" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
-%Method "Composer\\Plugin\\PluginInterface::(activate|deactivate|uninstall)\(\)" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 %Method "Doctrine\\Common\\Annotations\\Reader::[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 %Method "Twig\\Extension\\ExtensionInterface::[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 %Method "Twig\\Loader\\FilesystemLoader::findTemplate\(\)" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
@@ -19,39 +16,19 @@
 %Method "Twig\\TokenParser\\TokenParserInterface::[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 %Method "WebDriver\\Service\\CurlServiceInterface::[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in implementation "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 
-# Skip root namespace native DebugClassLoader forward compatibility warnings.
-# These mostly refer to PHP native classes, could be fixed for PHP 8.1.
-%Method "[^\\]+::\w+\(\)" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
+# Indirect deprecations. These are not in Drupal's remit to fix, but it is
+# worth keeping track of dependencies' issues.
+%Method "[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in implementation "org\\bovigo\\vfs\\[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
+%Method "[^"]+" might add "[^"]+" as a native return type declaration in the future. Do the same in (child class|implementation) "OpenTelemetry\\[^"]+" now to avoid errors or add an explicit @return annotation to suppress this message%
 
 # The following deprecation is listed for Twig 2 compatibility when unit
 # testing using \Symfony\Component\ErrorHandler\DebugClassLoader.
+%The "Twig\\Template" class is considered internal\. It may change without further notice\. You should not use it from "Drupal\\Tests\\Core\\Template\\StubTwigTemplate"\.%
 %The "Twig\\Environment::getTemplateClass\(\)" method is considered internal\. It may change without further notice\. You should not extend it from "Drupal\\Core\\Template\\TwigEnvironment"\.%
 
-# Drupal 11.
-%Drupal\\Core\\Form\\FormBuilder::getForm\(\).* will require a new "mixed \.\.\. \$args" argument in the next major version of its interface%
-%Drupal\\Core\\Form\\FormBuilder::submitForm\(\).* will require a new "mixed \.\.\. \$args" argument in the next major version of its interface%
+# PHPUnit 10.
+%The "PHPUnit\\Framework\\TestCase::__construct\(\)" method is considered internal.*You should not extend it from "Drupal\\[^"]+"%
 
-# PHPUnit 9.
-%"PHPUnit\\Framework\\TestListener".*is deprecated%
-%"PHPUnit\\Framework\\TestListenerDefaultImplementation".*is deprecated%
-%"PHPUnit\\Framework\\TestSuite".*is considered internal%
-%"PHPUnit\\TextUI\\DefaultResultPrinter".*is considered internal%
-
-# PHPUnit 9.6.
-%Expecting E_WARNING and E_USER_WARNING is deprecated and will no longer be possible in PHPUnit 10%
-%Expecting E_ERROR and E_USER_ERROR is deprecated and will no longer be possible in PHPUnit 10%
-
-# Skip deprecations for EditorMediaDialog, EditorImageDialog and EditorLinkDialog triggered by
-# \Drupal\Core\Entity\EntityResolverManager::setRouteOptions().
-%Drupal\\media\\Form\\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%
-%Drupal\\editor\\Form\\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%
-%Drupal\\editor\\Form\\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3291493%
-
-# Symfony 7.
-%Method "Symfony\\Contracts\\Service\\ResetInterface::reset\(\)" might add "void" as a native return type declaration in the future. Do the same in implementation "Drupal\\Component\\DependencyInjection\\Container" now to avoid errors or add an explicit @return annotation to suppress this message.%
-
-# Temporarily for testing Symfony 6.4.
-%Since symfony/dependency-injection 6.4: "Symfony\\Component\\DependencyInjection\\ContainerAwareTrait" is deprecated, use dependency injection instead.%
-%The ".*" class uses "Symfony\\Component\\DependencyInjection\\ContainerAwareTrait" that is deprecated since Symfony 6.4, use dependency injection instead.%
-%The ".*" class implements "Symfony\\Component\\DependencyInjection\\ContainerAwareInterface" that is deprecated since Symfony 6.4, use dependency injection instead.%
-%The ".*" interface extends "Symfony\\Component\\DependencyInjection\\ContainerAwareInterface" that is deprecated since Symfony 6.4, use dependency injection instead.%
+# 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.%

core/.env.example

@@ -46,6 +46,9 @@ DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=true
 # e.g. `--disable-gpu --headless --no-sandbox`.
 #DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=
 
+# Use W3C webdriver commands.
+#DRUPAL_TEST_WEBDRIVER_W3C=true
+
 # A list of arguments to pass to Webdriver, separated by spaces
 # e.g. `--allowed-ips --disable-dev-shm-usage`.
 #DRUPAL_TEST_WEBDRIVER_CLI_ARGS=

core/.eslintignore

@@ -2,14 +2,22 @@ assets/vendor/**/*
 node_modules/**/*
 **/js_test_files/**/*
 **/build/**/*
-modules/locale/tests/locale_test.js
+modules/locale/tests/js/locale_test.js
+misc/jquery.form.js
 
 # Ignore deliberately malformed YAML files.
 modules/system/tests/fixtures/HtaccessTest/access_test.yml
 modules/system/tests/themes/test_theme_libraries_empty/test_theme_libraries_empty.info.yml
 tests/Drupal/Tests/Core/Asset/library_test_files/empty.libraries.yml
 tests/Drupal/Tests/Core/Asset/library_test_files/invalid_file.libraries.yml
+tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/default.services.yml
+tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-profile/assets/profile.default.services.yml
+modules/system/tests/themes/sdc_theme_test/components/bar/bar.component.yml
 
 # Temporary until they are brought up to standards
 scripts/**/*
 modules/ckeditor5/webpack.config.js
+misc/jquery.form.js
+
+# Temporary until they are moved into assets/vendor
+modules/navigation/assets/vendor/**/*

core/.eslintrc.jquery.json

 {
   "plugins": [
-    "jquery"
+    "no-jquery"
   ],
   "rules": {
-    "jquery/no-ajax": 0,
-    "jquery/no-ajax-events": 2,
-    "jquery/no-animate": 0,
-    "jquery/no-attr": 0,
-    "jquery/no-bind": 2,
-    "jquery/no-class": 0,
-    "jquery/no-clone": 0,
-    "jquery/no-closest": 0,
-    "jquery/no-css": 2,
-    "jquery/no-data": 0,
-    "jquery/no-deferred": 0,
-    "jquery/no-delegate": 2,
-    "jquery/no-each": 0,
-    "jquery/no-extend": 0,
-    "jquery/no-fade": 0,
-    "jquery/no-filter": 0,
-    "jquery/no-find": 0,
-    "jquery/no-global-eval": 2,
-    "jquery/no-grep": 2,
-    "jquery/no-has": 0,
-    "jquery/no-hide": 0,
-    "jquery/no-html": 0,
-    "jquery/no-in-array": 0,
-    "jquery/no-is-array": 0,
-    "jquery/no-is-function": 2,
-    "jquery/no-is": 2,
-    "jquery/no-load": 2,
-    "jquery/no-map": 2,
-    "jquery/no-merge": 2,
-    "jquery/no-param": 2,
-    "jquery/no-parent": 0,
-    "jquery/no-parents": 0,
-    "jquery/no-parse-html": 0,
-    "jquery/no-prop": 0,
-    "jquery/no-proxy": 2,
-    "jquery/no-ready": 2,
-    "jquery/no-serialize": 2,
-    "jquery/no-show": 0,
-    "jquery/no-size": 2,
-    "jquery/no-sizzle": 0,
-    "jquery/no-slide": 0,
-    "jquery/no-submit": 2,
-    "jquery/no-text": 2,
-    "jquery/no-toggle": 0,
-    "jquery/no-trigger": 0,
-    "jquery/no-trim": 2,
-    "jquery/no-val": 2,
-    "jquery/no-when": 0,
-    "jquery/no-wrap": 0
+    "no-jquery/no-ajax": 0,
+    "no-jquery/no-ajax-events": 2,
+    "no-jquery/no-animate": 2,
+    "no-jquery/no-attr": 0,
+    "no-jquery/no-bind": 2,
+    "no-jquery/no-class": 0,
+    "no-jquery/no-clone": 2,
+    "no-jquery/no-closest": 0,
+    "no-jquery/no-css": 2,
+    "no-jquery/no-data": 0,
+    "no-jquery/no-deferred": 0,
+    "no-jquery/no-delegate": 2,
+    "no-jquery/no-each": 0,
+    "no-jquery/no-extend": 0,
+    "no-jquery/no-fade": 0,
+    "no-jquery/no-filter": 0,
+    "no-jquery/no-find": 0,
+    "no-jquery/no-global-eval": 2,
+    "no-jquery/no-grep": 2,
+    "no-jquery/no-has": 0,
+    "no-jquery/no-hide": 0,
+    "no-jquery/no-html": 0,
+    "no-jquery/no-in-array": 0,
+    "no-jquery/no-is-array": 0,
+    "no-jquery/no-is-function": 2,
+    "no-jquery/no-is": 2,
+    "no-jquery/no-load": 2,
+    "no-jquery/no-map": 2,
+    "no-jquery/no-merge": 2,
+    "no-jquery/no-param": 2,
+    "no-jquery/no-parent": 0,
+    "no-jquery/no-parents": 0,
+    "no-jquery/no-parse-html": 2,
+    "no-jquery/no-prop": 0,
+    "no-jquery/no-proxy": 2,
+    "no-jquery/no-ready": 2,
+    "no-jquery/no-serialize": 2,
+    "no-jquery/no-show": 0,
+    "no-jquery/no-size": 2,
+    "no-jquery/no-sizzle": 0,
+    "no-jquery/no-slide": 0,
+    "no-jquery/no-submit": 2,
+    "no-jquery/no-text": 2,
+    "no-jquery/no-toggle": 0,
+    "no-jquery/no-trigger": 0,
+    "no-jquery/no-trim": 2,
+    "no-jquery/no-val": 2,
+    "no-jquery/no-when": 2,
+    "no-jquery/no-wrap": 0
   }
-}
+}
\ No newline at end of file

core/.eslintrc.json

@@ -21,15 +21,15 @@
     "_": true,
     "Cookies": true,
     "Backbone": true,
-    "Modernizr": true,
     "loadjs": true,
     "Shepherd": true,
     "Sortable": true,
     "once": true,
     "CKEditor5": true,
     "tabbable": true,
-    "slugify": true,
-    "bodyScrollLock" : true
+    "transliterate": true,
+    "bodyScrollLock" : true,
+    "FloatingUIDOM": true
   },
   "rules": {
     "prettier/prettier": "error",

core/.eslintrc.legacy.json

@@ -12,8 +12,7 @@
     "jQuery": true,
     "_": true,
     "matchMedia": true,
-    "Backbone": true,
-    "Modernizr": true
+    "Backbone": true
   },
   "rules": {
     "array-bracket-spacing": ["error", "never"],