.gitattributes

@@ -42,9 +42,13 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."
+*.avif    -text diff
 *.eot     -text diff
 *.exe     -text diff
 *.gif     -text diff

.gitlab-ci/pipeline-test-only.yml

-# cspell:ignore drupaltestbot drupaltestbotpw
+# cspell:ignore drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB
 
 stages:
   - 🗜️ Test
@@ -14,7 +14,7 @@ variables:
   POSTGRES_DB: drupaltestbot
   POSTGRES_USER: drupaltestbot
   POSTGRES_PASSWORD: drupaltestbotpw
-  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless"]}}, "http://localhost:9515"]'
+  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://selenium:4444"]'
 
 '🩹 Test-only changes':
   stage: 🗜️ Test
@@ -25,18 +25,18 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "parent_pipeline" && $PERFORMANCE_TEST != "1"
   needs:
     - pipeline: $PARENT_PIPELINE_ID
-      job: '📦️ Composer'
+      job: '🧹 PHP Coding standards (PHPCS)'
   services:
     - name: $_CONFIG_DOCKERHUB_ROOT/$_TARGET_DB:production
       alias: database
-    - name: $_CONFIG_DOCKERHUB_ROOT/chromedriver:production
-      alias: chrome
-      entrypoint:
-        - chromedriver
-        - "--no-sandbox"
-        - "--log-path=/tmp/chromedriver.log"
-        - "--verbose"
-        - "--whitelisted-ips="
+    - name: selenium/standalone-chrome:latest
+      alias: selenium
+      variables:
+        JAVA_OPTS: "-Dwebdriver.chrome.logfile=/builds/chromedriver.log"
+        SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
+        SE_NODE_MAX_SESSIONS: "5"
+        SE_START_XVFB: "false"
+        SE_START_VNC: "false"
   before_script:
     - |
       [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/$CI_PROJECT_DIR/sites/default/files/db.sqlite?module=sqlite

.gitlab-ci/pipeline.yml

-# cspell:ignore drupaltestbot drupaltestbotpw
+# cspell:ignore drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB
 
 stages:
   - 🗜️ Test
@@ -47,14 +47,14 @@ default:
 .with-composer: &with-composer
   needs:
     - pipeline: $PARENT_PIPELINE_ID
-      job: '📦️ Composer'
+      job: '🧹 PHP Coding standards (PHPCS)'
 
 .with-composer-and-yarn: &with-composer-and-yarn
   needs:
     - pipeline: $PARENT_PIPELINE_ID
-      job: '📦️ Composer'
+      job: '🧹 PHP Coding standards (PHPCS)'
     - pipeline: $PARENT_PIPELINE_ID
-      job: '📦️ Yarn'
+      job: '📔 Spell-checking'
 
 variables:
   FF_NETWORK_PER_BUILD: 1
@@ -67,7 +67,8 @@ variables:
   POSTGRES_DB: drupaltestbot
   POSTGRES_USER: drupaltestbot
   POSTGRES_PASSWORD: drupaltestbotpw
-  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless","--dns-prefetch-disable"]}}, "http://localhost:9515"]'
+  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://selenium:4444"]'
+  MINK_DRIVER_ARGS_WEBDRIVER_CHROMEDRIVER_NON_W3C: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless","--dns-prefetch-disable"]}}, "http://localhost:9515"]'
   CI_PARALLEL_NODE_INDEX: $CI_NODE_INDEX
   CI_PARALLEL_NODE_TOTAL: $CI_NODE_TOTAL
 
@@ -85,10 +86,22 @@ variables:
     - "--whitelisted-ips="
     - "--allowed-origins=*"
 
+.with-selenium-chrome: &with-selenium-chrome
+  name: selenium/standalone-chrome:127.0
+  alias: selenium
+  variables:
+    JAVA_OPTS: "-Dwebdriver.chrome.logfile=/builds/chromedriver.log"
+    SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
+    SE_NODE_MAX_SESSIONS: "16"
+    SE_SESSION_RETRY_INTERVAL: "1"
+    SE_SESSION_REQUEST_TIMEOUT: "60"
+    SE_START_XVFB: "true"
+    SE_START_VNC: "false"
+
 .run-tests: &run-tests
   script:
     # Need to pass this along directly.
-    - sudo MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" -u www-data php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --all --ci-parallel-node-index $CI_PARALLEL_NODE_INDEX --ci-parallel-node-total $CI_PARALLEL_NODE_TOTAL
+    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --all --ci-parallel-node-index $CI_PARALLEL_NODE_INDEX --ci-parallel-node-total $CI_PARALLEL_NODE_TOTAL
 
 .run-repeat-class-test: &run-repeat-class-test
   script:
@@ -100,7 +113,7 @@ variables:
         echo '   "Key" to "REPEAT_TEST_CLASS" and "Value" to "Drupal\Tests\ckeditor5\FunctionalJavascript\MediaLinkabilityTest"';
         exit 1;
       else
-        sudo MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" -u www-data php ./core/scripts/run-tests.sh --color --keep-results --concurrency "$CONCURRENCY" --repeat "100" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --class $REPEAT_TEST_CLASS
+        sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --concurrency "$CONCURRENCY" --repeat "100" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --class $REPEAT_TEST_CLASS
       fi
 
 ################
@@ -119,67 +132,61 @@ variables:
   allow_failure: true
   services:
     - <<: *with-database
-    - <<: *with-chrome
+    - <<: *with-selenium-chrome
   script:
     - $CI_PROJECT_DIR/.gitlab-ci/scripts/test-only.sh
 
 '🖱️️️ PHPUnit Functional Javascript':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
-  parallel: 2
+  parallel: 3
   variables:
     TESTSUITE: PHPUnit-FunctionalJavascript
-    CONCURRENCY: 15
-    KUBERNETES_CPU_REQUEST: "24"
+    CONCURRENCY: 5
+    KUBERNETES_CPU_REQUEST: "16"
   services:
     - <<: *with-database
-    - <<: *with-chrome
+    - <<: *with-selenium-chrome
   after_script:
+    - echo $MINK_DRIVER_ARGS_WEBDRIVER
     - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
     - cp /builds/chromedriver.log ./
 
-'🌐️️ PHPUnit Functional':
+'👷️️️ PHPUnit Build':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
-  parallel: 7
   variables:
-    TESTSUITE: PHPUnit-Functional
-    KUBERNETES_CPU_REQUEST: "24"
+    TESTSUITE: PHPUnit-Build
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: "5"
   services:
     - <<: *with-database
 
-'⚙️️ PHPUnit Kernel':
+'🌐️️ PHPUnit Functional':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
-  parallel: 3
+  parallel: 8
   variables:
-    TESTSUITE: PHPUnit-Kernel
+    TESTSUITE: PHPUnit-Functional
+    CONCURRENCY: "5"
     KUBERNETES_CPU_REQUEST: "16"
   services:
     - <<: *with-database
 
-'👷️️️ PHPUnit Build':
+'⚙️️ PHPUnit Kernel':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
+  parallel: 5
   variables:
-    TESTSUITE: PHPUnit-Build
-    KUBERNETES_CPU_REQUEST: "2"
-  services:
-    - <<: *with-database
-
-'⚡️ PHPUnit Unit':
-  <<: [ *with-composer, *run-tests, *default-job-settings ]
+    TESTSUITE: PHPUnit-Kernel
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: 12
   services:
-    # There are some unit tests that need a database.
-    # @todo Remove after https://www.drupal.org/project/drupal/issues/3386217
     - <<: *with-database
-  variables:
-    TESTSUITE: PHPUnit-Unit
-    KUBERNETES_CPU_REQUEST: "16"
 
 '🦉️️️ Nightwatch':
   <<: [ *with-composer-and-yarn, *default-job-settings ]
   variables:
-    KUBERNETES_CPU_REQUEST: "24"
+    KUBERNETES_CPU_REQUEST: "16"
   services:
     - <<: *with-database
-    - <<: *with-chrome
+    - <<: *with-selenium-chrome
   script:
     - export DRUPAL_TEST_DB_URL=$SIMPLETEST_DB
     - cp ./core/.env.example ./core/.env
@@ -189,13 +196,16 @@ variables:
     - echo "DRUPAL_TEST_BASE_URL='http://localhost/subdirectory'" >> ./core/.env
     - echo "DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=false" >> ./core/.env
     - echo "DRUPAL_TEST_DB_URL='${DRUPAL_TEST_DB_URL}'" >> ./core/.env
-    - echo "DRUPAL_TEST_WEBDRIVER_HOSTNAME='localhost'" >> ./core/.env
+    - echo "DRUPAL_TEST_WEBDRIVER_HOSTNAME='selenium'" >> ./core/.env
     - echo "DRUPAL_TEST_WEBDRIVER_CHROME_ARGS='--disable-dev-shm-usage --disable-gpu --headless --dns-prefetch-disable'" >> ./core/.env
-    - echo "DRUPAL_TEST_WEBDRIVER_PORT='9515'" >> ./core/.env
+    - echo "DRUPAL_TEST_WEBDRIVER_W3C=true" >> ./core/.env
+    - echo "DRUPAL_TEST_WEBDRIVER_PORT='4444'" >> ./core/.env
     - echo "DRUPAL_NIGHTWATCH_OUTPUT='"../nightwatch_output"'" >> ./core/.env
     - echo "COLUMNS=1000" >> ./core/.env
     - chown -R www-data:www-data ./sites /var/www
-    - sudo -u www-data yarn run --cwd=./core test:nightwatch --workers=4
+    - cd core
+    - corepack enable
+    - sudo -u www-data -E -H yarn run test:nightwatch --workers=3
   after_script:
     - cp /builds/chromedriver.log ./
   artifacts:
@@ -207,6 +217,25 @@ variables:
       - ./nightwatch_output
       - '*.log'
 
+'🖱️️️ PHPUnit Functional Javascript (non W3C legacy)':
+  <<: [ *with-composer, *default-job-settings ]
+  parallel: 1
+  variables:
+    TESTSUITE: PHPUnit-FunctionalJavascript
+    CONCURRENCY: 6
+    KUBERNETES_CPU_REQUEST: "16"
+    MINK_DRIVER_ARGS_WEBDRIVER: $MINK_DRIVER_ARGS_WEBDRIVER_CHROMEDRIVER_NON_W3C
+  services:
+    - <<: *with-database
+    - <<: *with-chrome
+  script:
+    # Run a small subset of tests to prove non W3C testing still works.
+    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html javascript
+
+  after_script:
+    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
+    - cp /builds/chromedriver.log ./
+
 '🔁 Repeat Class Test':
   <<: [ *with-composer, *run-repeat-class-test, *default-job-settings ]
   when: manual
@@ -217,12 +246,14 @@ variables:
     - <<: *with-database
 
 '🚲 Performance tests':
-  <<: [ *with-composer, *default-job-settings ]
+  <<: [ *default-job-settings ]
   rules:
     - if: $PERFORMANCE_TEST == "1"
+    - when: manual
+      allow_failure: true
   variables:
     KUBERNETES_CPU_REQUEST: "24"
-    MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless","--no-sandbox"]}}, "http://chrome:9515"]'
+    MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless","--no-sandbox"]}}, "http://chrome:9515"]'
   tags:
     - performance-test-runner
   services:
@@ -235,8 +266,9 @@ variables:
       [[ $_TARGET_DB == mysql* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
       [[ $_TARGET_DB == mariadb* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
       [[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql
+    - composer install --optimize-autoloader
     - export OTEL_COLLECTOR="$OTEL_COLLECTOR"
     - mkdir -p ./sites/simpletest ./sites/default/files ./build/logs/junit /var/www/.composer
     - chown -R www-data:www-data ./sites ./build/logs/junit ./vendor /var/www/
     - sudo -u www-data git config --global --add safe.directory $CI_PROJECT_DIR
-    - sudo SIMPLETEST_BASE_URL="http://$HOSTNAME/subdirectory" SIMPLETEST_DB="$SIMPLETEST_DB" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" OTEL_COLLECTOR="$OTEL_COLLECTOR" -u www-data ./vendor/bin/phpunit --verbose -c core --group OpenTelemetry --log-junit=./sites/default/files/simpletest/phpunit-performance.xml
+    - sudo SIMPLETEST_BASE_URL="http://$HOSTNAME/subdirectory" -u www-data -E -H ./vendor/bin/phpunit -c core --group OpenTelemetry --log-junit=./sites/default/files/simpletest/phpunit-performance.xml

.gitlab-ci/scripts/test-only.sh

 #!/bin/bash
 
-export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}
-git fetch -vn --depth=50 origin "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH"
+BASELINE=${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA}
 
-echo "ℹ️ Changes from ${TARGET_BRANCH}"
-git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only
+echo "ℹ️ Changes from ${BASELINE}"
+git diff ${BASELINE} --name-only
 echo "If this list contains more files than what you changed, then you need to rebase your branch."
 
 echo "1️⃣ Reverting non test changes"
-if [[ $(git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --diff-filter=DM --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
-git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --diff-filter=DM --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh|while read file;do
+if [[ $(git diff ${BASELINE} --diff-filter=DM --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
+git diff ${BASELINE} --diff-filter=DM --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh|while read file;do
   echo "↩️ Reverting $file";
-  git checkout refs/heads/${TARGET_BRANCH} -- $file;
+  git checkout ${BASELINE} -- $file;
 done
 fi
-if [[ $(git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --diff-filter=A --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
-git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --diff-filter=A --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh|while read file;do
+if [[ $(git diff ${BASELINE} --diff-filter=A --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
+git diff ${BASELINE} --diff-filter=A --name-only|grep -Ev "*/tests/*"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh|while read file;do
   echo "🗑️️ Deleting $file";
   git rm $file;
 done
 fi
 
 echo "2️⃣ Running test changes for this branch"
-if [[ $(git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only|grep -E "Test.php$") ]]; then
-for test in `git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only|grep -E "Test.php$"`; do
-  sudo SIMPLETEST_BASE_URL="$SIMPLETEST_BASE_URL" SIMPLETEST_DB="$SIMPLETEST_DB" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" -u www-data ./vendor/bin/phpunit -c core $test --log-junit=./sites/default/files/simpletest/phpunit-`echo $test|sed 's/\//_/g' `.xml;
+EXIT_CODE=0
+if [[ $(git diff ${BASELINE} --name-only|grep -E "Test.php$") ]]; then
+for test in `git diff ${BASELINE} --name-only|grep -E "Test.php$"`; do
+  sudo SIMPLETEST_BASE_URL="$SIMPLETEST_BASE_URL" SIMPLETEST_DB="$SIMPLETEST_DB" MINK_DRIVER_ARGS_WEBDRIVER="$MINK_DRIVER_ARGS_WEBDRIVER" -u www-data ./vendor/bin/phpunit -c core $test --log-junit=./sites/default/files/simpletest/phpunit-`echo $test|sed 's/\//_/g' `.xml || EXIT_CODE=$?;
 done;
 fi
+
+echo "Exiting with EXIT_CODE=$EXIT_CODE"
+exit $EXIT_CODE

.htaccess

@@ -22,6 +22,9 @@ DirectoryIndex index.php index.html index.htm
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 
+# Add correct encoding for webp.
+AddType image/webp .webp
+
 # Most of the following PHP settings cannot be changed at runtime. See
 # sites/default/default.settings.php and
 # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
@@ -137,10 +140,6 @@ AddEncoding gzip svgz
   RewriteCond %{REQUEST_URI} !/core/[^/]*\.php$
   # Allow access to test-specific PHP files:
   RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?\.php
-  # Allow access to Statistics module's custom front controller.
-  # Copy and adapt this rule to directly execute PHP files in contributed or
-  # custom modules or to run another PHP application in the same directory.
-  RewriteCond %{REQUEST_URI} !/core/modules/statistics/statistics\.php$
   # Deny access to any other PHP files that do not match the rules above.
   # Specifically, disallow autoload.php from being served directly.
   RewriteRule "^(.+/.*|autoload)\.php($|/)" - [F]

composer.json

@@ -9,7 +9,7 @@
         "chat": "https://www.drupal.org/node/314178"
     },
     "require": {
-        "composer/installers": "^2.0",
+        "composer/installers": "^2.3",
         "drupal/core": "self.version",
         "drupal/core-project-message": "self.version",
         "drupal/core-vendor-hardening": "self.version"
@@ -17,37 +17,38 @@
     "require-dev": {
         "behat/mink": "^1.11",
         "behat/mink-browserkit-driver": "^2.2",
-        "behat/mink-selenium2-driver": "^1.7",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.6.4",
+        "composer/composer": "^2.8.1",
         "drupal/coder": "^8.3.10",
-        "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2.1",
+        "lullabot/mink-selenium2-driver": "^1.7.3",
+        "lullabot/php-webdriver": "^2.0.5",
+        "mglaman/phpstan-drupal": "^1.2.11 || ^2.0",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
         "open-telemetry/sdk": "^1",
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.47",
-        "phpstan/phpstan-phpunit": "^1.3.11",
-        "phpunit/phpunit": "^9.6.13",
-        "symfony/browser-kit": "^6.4",
-        "symfony/css-selector": "^6.4",
-        "symfony/dom-crawler": "^6.4",
-        "symfony/error-handler": "^6.4",
-        "symfony/lock": "^6.4",
-        "symfony/phpunit-bridge": "^6.4",
-        "symfony/var-dumper": "^6.4"
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^1.12.4 || ^2.0.4",
+        "phpstan/phpstan-phpunit": "^1.3.16 || ^2.0.1",
+        "phpunit/phpunit": "^10.5.19",
+        "symfony/browser-kit": "^7.2",
+        "symfony/css-selector": "^7.2",
+        "symfony/dom-crawler": "^7.2",
+        "symfony/error-handler": "^7.2",
+        "symfony/lock": "^7.2",
+        "symfony/var-dumper": "^7.2"
     },
     "replace": {
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*",
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
-        "symfony/polyfill-php81": "*"
+        "symfony/polyfill-php81": "*",
+        "symfony/polyfill-php82": "*",
+        "symfony/polyfill-php83": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -55,15 +56,16 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.1.0"
+            "php": "8.3.0"
         },
         "allow-plugins": {
             "composer/installers": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-project-message": true,
             "drupal/core-vendor-hardening": true,
+            "php-http/discovery": true,
             "phpstan/extension-installer": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "php-http/discovery": true
+            "tbachert/spi": false
         }
     },
     "extra": {
@@ -103,6 +105,11 @@
             "Drupal\\Composer\\": "composer"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Drupal\\PHPStan\\Rules\\": "core/tests/PHPStan/Rules"
+        }
+    },
     "scripts": {
         "pre-install-cmd": "Drupal\\Composer\\Composer::ensureComposerVersion",
         "pre-update-cmd": "Drupal\\Composer\\Composer::ensureComposerVersion",

composer/Composer.php

@@ -119,9 +119,10 @@ public static function drupalVersionBranch(): string {
    * @param string $root
    *   Path to root of drupal/drupal repository.
    * @param string $subprojectType
-   *   Type of subproject - one of Metapackage, Plugin, or Template
+   *   Type of subproject - one of Metapackage, Plugin, or Template.
    *
    * @return \Symfony\Component\Finder\Finder
+   *   A Finder object.
    */
   public static function composerSubprojectPaths(string $root, string $subprojectType): Finder {
     return Finder::create()

composer/Generator/Builder/DrupalCoreRecommendedBuilder.php

@@ -59,6 +59,7 @@ public function getPackage() {
    * Returns the initial package metadata that describes the metapackage.
    *
    * @return array
+   *   The initial package metadata.
    */
   protected function initialPackageMetadata() {
     return [

composer/Generator/Builder/DrupalDevDependenciesBuilder.php

@@ -34,6 +34,7 @@ public function getPackage() {
    * Returns the initial package metadata that describes the metapackage.
    *
    * @return array
+   *   The initial package metadata.
    */
   protected function initialPackageMetadata() {
     return [

composer/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php

@@ -39,6 +39,7 @@ public function getPackage() {
    * Returns the initial package metadata that describes the metapackage.
    *
    * @return array
+   *   The initial package metadata.
    */
   protected function initialPackageMetadata() {
     return [

composer/Generator/ComponentGenerator.php

@@ -226,7 +226,7 @@ protected function initialPackageMetadata(): array {
       ],
       // Always reconcile PHP version.
       'require' => [
-        'php' => '>=7.3.0',
+        'php' => '>=' . \Drupal::MINIMUM_PHP,
       ],
     ];
   }

composer/Generator/PackageGenerator.php

@@ -64,6 +64,7 @@ public function generate(IOInterface $io, $base_dir) {
    * Returns a list of metapackage builders.
    *
    * @return BuilderInterface[]
+   *   An array of BuilderInterface objects.
    */
   protected function builders() {
     return [

composer/Generator/Util/DrupalCoreComposer.php

@@ -92,7 +92,7 @@ public function getRequireDev() {
    * @param string $packageName
    *   Name of package to find, e.g. 'behat/mink-selenium2-driver'.
    * @param bool $dev
-   *   TRUE: consider only 'packages-dev'. Default: consider only 'packages'
+   *   TRUE: consider only 'packages-dev'. Default: consider only 'packages'.
    *
    * @return array
    *   Package info from composer.lock.

composer/Metapackage/CoreRecommended/composer.json

@@ -9,58 +9,59 @@
     "require": {
         "drupal/core": "11.x-dev",
         "asm89/stack-cors": "~v2.2.0",
-        "composer/semver": "~3.4.0",
-        "doctrine/annotations": "~1.14.3",
-        "doctrine/deprecations": "~1.1.2",
-        "doctrine/lexer": "~2.1.0",
+        "composer/semver": "~3.4.3",
+        "doctrine/annotations": "~2.0.2",
+        "doctrine/deprecations": "~1.1.3",
+        "doctrine/lexer": "~2.1.1",
         "egulias/email-validator": "~4.0.2",
-        "guzzlehttp/guzzle": "~7.8.1",
-        "guzzlehttp/promises": "~2.0.2",
-        "guzzlehttp/psr7": "~2.6.2",
-        "masterminds/html5": "~2.8.1",
-        "mck89/peast": "~v1.15.4",
-        "pear/archive_tar": "~1.4.14",
+        "guzzlehttp/guzzle": "~7.9.2",
+        "guzzlehttp/promises": "~2.0.4",
+        "guzzlehttp/psr7": "~2.7.0",
+        "masterminds/html5": "~2.9.0",
+        "mck89/peast": "~v1.16.3",
+        "pear/archive_tar": "~1.5.0",
         "pear/console_getopt": "~v1.4.3",
-        "pear/pear-core-minimal": "~v1.10.14",
+        "pear/pear-core-minimal": "~v1.10.16",
         "pear/pear_exception": "~v1.0.2",
+        "php-tuf/composer-stager": "~v2.0.0",
         "psr/cache": "~3.0.0",
         "psr/container": "~2.0.2",
         "psr/event-dispatcher": "~1.0.0",
         "psr/http-client": "~1.0.3",
-        "psr/http-factory": "~1.0.2",
-        "psr/log": "~3.0.0",
+        "psr/http-factory": "~1.1.0",
+        "psr/log": "~3.0.2",
         "ralouphie/getallheaders": "~3.0.3",
-        "sebastian/diff": "~4.0.5",
-        "symfony/console": "~v6.4.1",
-        "symfony/dependency-injection": "~v6.4.1",
-        "symfony/deprecation-contracts": "~v3.4.0",
-        "symfony/error-handler": "~v6.4.0",
-        "symfony/event-dispatcher": "~v6.4.0",
-        "symfony/event-dispatcher-contracts": "~v3.4.0",
-        "symfony/filesystem": "~v6.4.0",
-        "symfony/finder": "~v6.4.0",
-        "symfony/http-foundation": "~v6.4.0",
-        "symfony/http-kernel": "~v6.4.1",
-        "symfony/mailer": "~v6.4.0",
-        "symfony/mime": "~v6.4.0",
-        "symfony/polyfill-ctype": "~v1.28.0",
-        "symfony/polyfill-iconv": "~v1.28.0",
-        "symfony/polyfill-intl-grapheme": "~v1.28.0",
-        "symfony/polyfill-intl-idn": "~v1.28.0",
-        "symfony/polyfill-intl-normalizer": "~v1.28.0",
-        "symfony/polyfill-mbstring": "~v1.28.0",
-        "symfony/polyfill-php83": "~v1.28.0",
-        "symfony/process": "~v6.4.0",
-        "symfony/psr-http-message-bridge": "~v6.4.0",
-        "symfony/routing": "~v6.4.1",
-        "symfony/serializer": "~v6.4.1",
-        "symfony/service-contracts": "~v3.4.0",
-        "symfony/string": "~v6.4.0",
-        "symfony/translation-contracts": "~v3.4.0",
-        "symfony/validator": "~v6.4.0",
-        "symfony/var-dumper": "~v6.4.0",
-        "symfony/var-exporter": "~v6.4.1",
-        "symfony/yaml": "~v6.4.0",
-        "twig/twig": "~v3.8.0"
+        "revolt/event-loop": "~v1.0.6",
+        "sebastian/diff": "~5.1.1",
+        "symfony/console": "~v7.2.0",
+        "symfony/dependency-injection": "~v7.2.0",
+        "symfony/deprecation-contracts": "~v3.5.1",
+        "symfony/error-handler": "~v7.2.0",
+        "symfony/event-dispatcher": "~v7.2.0",
+        "symfony/event-dispatcher-contracts": "~v3.5.1",
+        "symfony/filesystem": "~v7.2.0",
+        "symfony/finder": "~v7.2.0",
+        "symfony/http-foundation": "~v7.2.0",
+        "symfony/http-kernel": "~v7.2.0",
+        "symfony/mailer": "~v7.2.0",
+        "symfony/mime": "~v7.2.0",
+        "symfony/polyfill-ctype": "~v1.31.0",
+        "symfony/polyfill-iconv": "~v1.31.0",
+        "symfony/polyfill-intl-grapheme": "~v1.31.0",
+        "symfony/polyfill-intl-idn": "~v1.31.0",
+        "symfony/polyfill-intl-normalizer": "~v1.31.0",
+        "symfony/polyfill-mbstring": "~v1.31.0",
+        "symfony/process": "~v7.2.0",
+        "symfony/psr-http-message-bridge": "~v7.2.0",
+        "symfony/routing": "~v7.2.0",
+        "symfony/serializer": "~v7.2.0",
+        "symfony/service-contracts": "~v3.5.1",
+        "symfony/string": "~v7.2.0",
+        "symfony/translation-contracts": "~v3.5.1",
+        "symfony/validator": "~v7.2.0",
+        "symfony/var-dumper": "~v7.2.0",
+        "symfony/var-exporter": "~v7.2.0",
+        "symfony/yaml": "~v7.2.0",
+        "twig/twig": "~v3.19.0"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -9,29 +9,28 @@
     "require": {
         "behat/mink": "^1.11",
         "behat/mink-browserkit-driver": "^2.2",
-        "behat/mink-selenium2-driver": "^1.7",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.6.4",
+        "composer/composer": "^2.8.1",
         "drupal/coder": "^8.3.10",
-        "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2.1",
+        "lullabot/mink-selenium2-driver": "^1.7.3",
+        "lullabot/php-webdriver": "^2.0.5",
+        "mglaman/phpstan-drupal": "^1.2.11 || ^2.0",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
         "open-telemetry/sdk": "^1",
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.47",
-        "phpstan/phpstan-phpunit": "^1.3.11",
-        "phpunit/phpunit": "^9.6.13",
-        "symfony/browser-kit": "^6.4",
-        "symfony/css-selector": "^6.4",
-        "symfony/dom-crawler": "^6.4",
-        "symfony/error-handler": "^6.4",
-        "symfony/lock": "^6.4",
-        "symfony/phpunit-bridge": "^6.4",
-        "symfony/var-dumper": "^6.4"
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^1.12.4 || ^2.0.4",
+        "phpstan/phpstan-phpunit": "^1.3.16 || ^2.0.1",
+        "phpunit/phpunit": "^10.5.19",
+        "symfony/browser-kit": "^7.2",
+        "symfony/css-selector": "^7.2",
+        "symfony/dom-crawler": "^7.2",
+        "symfony/error-handler": "^7.2",
+        "symfony/lock": "^7.2",
+        "symfony/var-dumper": "^7.2"
     }
 }

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -8,86 +8,88 @@
     },
     "require": {
         "drupal/core": "11.x-dev",
-        "behat/mink": "v1.11.0",
+        "behat/mink": "v1.12.0",
         "behat/mink-browserkit-driver": "v2.2.0",
-        "behat/mink-selenium2-driver": "v1.7.0",
+        "brick/math": "0.12.1",
         "colinodell/psr-testlogger": "v1.3.0",
-        "composer/ca-bundle": "1.3.7",
-        "composer/class-map-generator": "1.1.0",
-        "composer/composer": "2.6.6",
+        "composer/ca-bundle": "1.5.4",
+        "composer/class-map-generator": "1.5.0",
+        "composer/composer": "2.8.3",
         "composer/metadata-minifier": "1.0.0",
-        "composer/pcre": "3.1.1",
+        "composer/pcre": "3.3.2",
         "composer/spdx-licenses": "1.5.8",
-        "composer/xdebug-handler": "3.0.3",
+        "composer/xdebug-handler": "3.0.5",
         "dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
         "doctrine/instantiator": "2.0.0",
-        "drupal/coder": "8.3.22",
-        "google/protobuf": "v3.25.1",
-        "instaclick/php-webdriver": "1.4.18",
-        "justinrainbow/json-schema": "v5.2.13",
-        "mglaman/phpstan-drupal": "1.2.4",
+        "drupal/coder": "8.3.26",
+        "google/protobuf": "v4.29.1",
+        "justinrainbow/json-schema": "5.3.0",
+        "lullabot/mink-selenium2-driver": "v1.7.4",
+        "lullabot/php-webdriver": "v2.0.6",
+        "mglaman/phpstan-drupal": "2.0.0",
         "micheh/phpcs-gitlab": "1.1.0",
-        "mikey179/vfsstream": "v1.6.11",
-        "myclabs/deep-copy": "1.11.1",
-        "nikic/php-parser": "v4.18.0",
-        "open-telemetry/api": "1.0.0",
-        "open-telemetry/context": "1.0.0",
-        "open-telemetry/exporter-otlp": "1.0.0",
-        "open-telemetry/gen-otlp-protobuf": "1.0.0",
-        "open-telemetry/sdk": "1.0.1",
-        "open-telemetry/sem-conv": "1.23.1",
-        "phar-io/manifest": "2.0.3",
+        "mikey179/vfsstream": "v1.6.12",
+        "myclabs/deep-copy": "1.12.1",
+        "nikic/php-parser": "v5.3.1",
+        "nyholm/psr7-server": "1.1.0",
+        "open-telemetry/api": "1.1.1",
+        "open-telemetry/context": "1.1.0",
+        "open-telemetry/exporter-otlp": "1.1.0",
+        "open-telemetry/gen-otlp-protobuf": "1.2.1",
+        "open-telemetry/sdk": "1.1.2",
+        "open-telemetry/sem-conv": "1.27.1",
+        "phar-io/manifest": "2.0.4",
         "phar-io/version": "3.2.1",
-        "php-http/discovery": "1.19.2",
-        "php-http/guzzle7-adapter": "1.0.0",
-        "php-http/httplug": "2.4.0",
-        "php-http/promise": "1.2.1",
+        "php-http/discovery": "1.20.0",
+        "php-http/guzzle7-adapter": "1.1.0",
+        "php-http/httplug": "2.4.1",
+        "php-http/promise": "1.3.1",
         "phpdocumentor/reflection-common": "2.2.0",
-        "phpdocumentor/reflection-docblock": "5.3.0",
-        "phpdocumentor/type-resolver": "1.7.3",
-        "phpspec/prophecy": "v1.18.0",
-        "phpspec/prophecy-phpunit": "v2.1.0",
-        "phpstan/extension-installer": "1.3.1",
-        "phpstan/phpdoc-parser": "1.24.4",
-        "phpstan/phpstan": "1.10.48",
-        "phpstan/phpstan-deprecation-rules": "1.1.4",
-        "phpstan/phpstan-phpunit": "1.3.15",
-        "phpunit/php-code-coverage": "9.2.29",
-        "phpunit/php-file-iterator": "3.0.6",
-        "phpunit/php-invoker": "3.1.1",
-        "phpunit/php-text-template": "2.0.4",
-        "phpunit/php-timer": "5.0.3",
-        "phpunit/phpunit": "9.6.15",
-        "react/promise": "v3.1.0",
-        "sebastian/cli-parser": "1.0.1",
-        "sebastian/code-unit": "1.0.8",
-        "sebastian/code-unit-reverse-lookup": "2.0.3",
-        "sebastian/comparator": "4.0.8",
-        "sebastian/complexity": "2.0.2",
-        "sebastian/environment": "5.1.5",
-        "sebastian/exporter": "4.0.5",
-        "sebastian/global-state": "5.0.6",
-        "sebastian/lines-of-code": "1.0.3",
-        "sebastian/object-enumerator": "4.0.4",
-        "sebastian/object-reflector": "2.0.4",
-        "sebastian/recursion-context": "4.0.5",
-        "sebastian/resource-operations": "3.0.3",
-        "sebastian/type": "3.2.1",
-        "sebastian/version": "3.0.2",
-        "seld/jsonlint": "1.10.0",
+        "phpdocumentor/reflection-docblock": "5.6.1",
+        "phpdocumentor/type-resolver": "1.10.0",
+        "phpspec/prophecy": "v1.20.0",
+        "phpspec/prophecy-phpunit": "v2.3.0",
+        "phpstan/extension-installer": "1.4.3",
+        "phpstan/phpdoc-parser": "1.33.0",
+        "phpstan/phpstan": "2.0.4",
+        "phpstan/phpstan-deprecation-rules": "2.0.1",
+        "phpstan/phpstan-phpunit": "2.0.1",
+        "phpunit/php-code-coverage": "10.1.16",
+        "phpunit/php-file-iterator": "4.1.0",
+        "phpunit/php-invoker": "4.0.0",
+        "phpunit/php-text-template": "3.0.1",
+        "phpunit/php-timer": "6.0.0",
+        "phpunit/phpunit": "10.5.38",
+        "ramsey/collection": "2.0.0",
+        "ramsey/uuid": "4.7.6",
+        "react/promise": "v3.2.0",
+        "sebastian/cli-parser": "2.0.1",
+        "sebastian/code-unit": "2.0.0",
+        "sebastian/code-unit-reverse-lookup": "3.0.0",
+        "sebastian/comparator": "5.0.3",
+        "sebastian/complexity": "3.2.0",
+        "sebastian/environment": "6.1.0",
+        "sebastian/exporter": "5.1.2",
+        "sebastian/global-state": "6.0.2",
+        "sebastian/lines-of-code": "2.0.2",
+        "sebastian/object-enumerator": "5.0.0",
+        "sebastian/object-reflector": "3.0.0",
+        "sebastian/recursion-context": "5.0.0",
+        "sebastian/type": "4.0.0",
+        "sebastian/version": "4.0.1",
+        "seld/jsonlint": "1.11.0",
         "seld/phar-utils": "1.2.1",
         "seld/signal-handler": "2.0.2",
-        "sirbrillig/phpcs-variable-analysis": "v2.11.17",
-        "slevomat/coding-standard": "8.14.1",
-        "squizlabs/php_codesniffer": "3.8.0",
-        "symfony/browser-kit": "v6.4.0",
-        "symfony/css-selector": "v6.4.0",
-        "symfony/dom-crawler": "v6.4.0",
-        "symfony/lock": "v6.4.0",
-        "symfony/phpunit-bridge": "v6.4.1",
-        "symfony/polyfill-php82": "v1.28.0",
-        "theseer/tokenizer": "1.2.2",
-        "webflo/drupal-finder": "1.2.2",
+        "sirbrillig/phpcs-variable-analysis": "v2.11.21",
+        "slevomat/coding-standard": "8.15.0",
+        "squizlabs/php_codesniffer": "3.11.1",
+        "symfony/browser-kit": "v7.2.0",
+        "symfony/css-selector": "v7.2.0",
+        "symfony/dom-crawler": "v7.2.0",
+        "symfony/lock": "v7.2.0",
+        "tbachert/spi": "v1.0.2",
+        "theseer/tokenizer": "1.2.3",
+        "webflo/drupal-finder": "1.3.1",
         "webmozart/assert": "1.11.0"
     }
 }

composer/Plugin/ProjectMessage/Message.php

@@ -108,6 +108,7 @@ public function getText() {
    *   The file to read. Relative paths are relative to the project directory.
    *
    * @return string[]
+   *   The message text.
    */
   protected function getMessageFromFile($file) {
     return file_exists($file) ? file($file, FILE_IGNORE_NEW_LINES) : [];

composer/Plugin/Scaffold/Handler.php

@@ -3,7 +3,6 @@
 namespace Drupal\Composer\Plugin\Scaffold;
 
 use Composer\Composer;
-use Composer\EventDispatcher\EventDispatcher;
 use Composer\Installer\PackageEvent;
 use Composer\IO\IOInterface;
 use Composer\Package\PackageInterface;
@@ -143,8 +142,8 @@ public function scaffold() {
     }
 
     // Call any pre-scaffold scripts that may be defined.
-    $dispatcher = new EventDispatcher($this->composer, $this->io);
-    $dispatcher->dispatch(self::PRE_DRUPAL_SCAFFOLD_CMD);
+    $dispatcher = $this->composer->getEventDispatcher();
+    $dispatcher->dispatchScript(self::PRE_DRUPAL_SCAFFOLD_CMD);
 
     // Fetch the list of file mappings from each allowed package and normalize
     // them.
@@ -179,7 +178,7 @@ public function scaffold() {
     $gitIgnoreManager->manageIgnored($scaffold_results, $scaffold_options);
 
     // Call post-scaffold scripts.
-    $dispatcher->dispatch(self::POST_DRUPAL_SCAFFOLD_CMD);
+    $dispatcher->dispatchScript(self::POST_DRUPAL_SCAFFOLD_CMD);
   }
 
   /**
@@ -197,7 +196,7 @@ protected function getVendorPath() {
   /**
    * Gets a consolidated list of file mappings from all allowed packages.
    *
-   * @param \Composer\Package\Package[] $allowed_packages
+   * @param \Composer\Package\PackageInterface[] $allowed_packages
    *   A multidimensional array of file mappings, as returned by
    *   self::getAllowedPackages().
    *