.gitlab-ci.yml

-# cspell:ignore codequality Micheh micheh webide testdox updatedb stylelintrc
+# cspell:ignore codequality Micheh micheh webide testdox updatedb stylelintrc fastzip
 
 ################
 # Drupal GitLabCI template.
@@ -56,7 +56,8 @@ workflow:
 ################
 
 variables:
-  _CONFIG_DOCKERHUB_ROOT: "drupalci"
+  FF_USE_FASTZIP: 1
+  _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.
@@ -66,6 +67,7 @@ variables:
   GIT_DEPTH: "50"
   PARENT_PIPELINE_ID: $CI_PIPELINE_ID
   _TARGET_PHP: "8.3-ubuntu"
+  PHPUNIT_FAIL_ON_PHPUNIT_DEPRECATION: false
 
 #############
 # Stages    #
@@ -108,6 +110,7 @@ default:
   before_script:
     - composer validate
     - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
     - 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/
   script:
@@ -122,6 +125,33 @@ default:
     paths:
       - ./sites/default/files/simpletest/phpunit-*.xml
 
+.default-component-unit-test-job-settings: &default-component-unit-test-job-settings
+  stage: 🪄 Lint
+  before_script:
+    - composer validate
+    - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
+    - docker-php-ext-enable pcov
+  script:
+    - |
+      [[ $PHPUNIT_FAIL_ON_PHPUNIT_DEPRECATION == false ]] && export _FAIL_ON_PHPUNIT_DEPRECATION=""
+      [[ $PHPUNIT_FAIL_ON_PHPUNIT_DEPRECATION != false ]] && export _FAIL_ON_PHPUNIT_DEPRECATION="--fail-on-phpunit-deprecation"
+    - vendor/bin/phpunit -c core/tests/Drupal/Tests/Component --testsuite unit-component --colors=always --testdox --coverage-text=component-coverage-report.txt --coverage-cobertura=component-coverage-cobertura.xml --log-junit junit.xml --fail-on-deprecation $_FAIL_ON_PHPUNIT_DEPRECATION
+    # Process the coverage text report to produce an OpenMetrics report.
+    - php .gitlab-ci/scripts/component-coverage-metrics.php
+  artifacts:
+    when: always
+    expire_in: 6 mos
+    reports:
+      junit: junit.xml
+      metrics: component-coverage-metrics.txt
+      coverage_report:
+        coverage_format: cobertura
+        path: component-coverage-cobertura.xml
+    paths:
+      - junit.xml
+      - component-coverage*
+
 .prepare-lint-directory: &prepare-lint-directory
   # PHPStan and yarn linting use absolute paths to determine cache validity. Because GitLab CI
   # working directories are not consistent, work around this by running linting in a separate,
@@ -258,7 +288,7 @@ default:
     _TARGET_PHP: "8.3-ubuntu"
     _TARGET_DB: "mysql-8.4"
 
-'PHP 8.4 MySQL 9.2':
+'PHP 8.4 MySQL 9.3':
   <<: [ *default-stage, *run-on-mr ]
   variables:
     _TARGET_PHP: "8.4-ubuntu"
@@ -331,31 +361,6 @@ default:
 # Lint Jobs
 ################
 
-'📔 Spell-checking':
-  <<: [ *default-job-settings-lint ]
-  stage: 🪄 Lint
-  variables:
-    KUBERNETES_CPU_REQUEST: "2"
-  script:
-    - *prepare-lint-directory
-    - *cspell-cache
-    - *core-spellcheck
-    - mv -f /build/core/package.json $CI_PROJECT_DIR/core/package.json
-    - mv -f /build/core/yarn.lock $CI_PROJECT_DIR/core/yarn.lock
-    - mv /build/core/node_modules $CI_PROJECT_DIR/core
-  cache:
-    key:
-      files:
-        - ./core/package.json
-        - ./core/yarn.lock
-    paths:
-      - ./core/node_modules
-  artifacts:
-    expire_in: 1 week
-    expose_as: 'yarn-vendor'
-    paths:
-      - core/node_modules/
-
 '📔 Spell-checking':
   <<: [ *default-job-settings-lint ]
   stage: 🪄 Lint
@@ -391,6 +396,7 @@ default:
     - *phpstan-cache
     - composer validate
     - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
     - if [ -n "$COMPOSER_UPDATE" ]; then
         composer update --optimize-autoloader;
         composer outdated;
@@ -400,15 +406,27 @@ default:
     # Output a copy in junit.
     - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > $CI_PROJECT_DIR/phpstan-quality-report.json || EXIT_CODE=$?
     - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist --no-progress --error-format=junit > $CI_PROJECT_DIR/phpstan-junit.xml || true
+    # When the PHPStan scan fails, output a human readable copy of the errors,
+    # and regenerate a full baseline.
+    # In order to regenerate a baseline artifact that can be copied and pasted
+    # to a MR branch, we first need to void the current baseline file, then
+    # run PHPStan with the --generate-baseline option, and finally edit the
+    # generated file to convert absolute paths into relative ones.
     - |
       if [ -n "$EXIT_CODE" ]; then
         # Output a copy in plain text for human logs.
         php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --no-progress || true
         # Generate a new baseline.
         echo "Generating an PHPStan baseline file (available as job artifact)."
+        cp $CI_PROJECT_DIR/.gitlab-ci/scripts/.empty-phpstan-baseline.php ./core/.phpstan-baseline.php
         php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --no-progress --generate-baseline=$CI_PROJECT_DIR/core/.phpstan-baseline.php || true
+        sed -i "s/ '\\/\\/build\\/core/ '/g" $CI_PROJECT_DIR/core/.phpstan-baseline.php
+        sed -i "s/ '\\/\\/build/ '\\/../g" $CI_PROJECT_DIR/core/.phpstan-baseline.php
+        php $CI_PROJECT_DIR/.gitlab-ci/scripts/phpstan-baseline-statistics.php
         exit $EXIT_CODE
       fi
+    # Generate baseline statistics.
+    - php $CI_PROJECT_DIR/.gitlab-ci/scripts/phpstan-baseline-statistics.php
 
   artifacts:
     # Only store the baseline if the job fails.
@@ -416,8 +434,9 @@ default:
     reports:
       codequality: phpstan-quality-report.json
       junit: phpstan-junit.xml
+      metrics: phpstan-metrics.txt
     paths:
-      - core/.phpstan-baseline.php
+      - $CI_PROJECT_DIR/core/.phpstan-baseline.php
 
 '🧹 PHP Coding standards (PHPCS)':
   <<: [ *default-job-settings-lint ]
@@ -427,6 +446,7 @@ default:
   script:
     - composer validate
     - composer install --optimize-autoloader
+    - composer run-script drupal-phpunit-upgrade-check
     - if [ -n "$COMPOSER_UPDATE" ]; then
         composer update --optimize-autoloader;
         composer outdated;
@@ -523,6 +543,25 @@ default:
     CONCURRENCY: 24
     _TARGET_PHP: "8.5-ubuntu"
 
+'⚡️ Component unit tests on PHP 8.3':
+  <<: [ *default-job-settings-lint, *default-component-unit-test-job-settings ]
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+    _TARGET_PHP: "8.3-ubuntu"
+
+'⚡️ Component unit tests on PHP 8.4':
+  <<: [ *default-job-settings-lint, *default-component-unit-test-job-settings ]
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+    _TARGET_PHP: "8.4-ubuntu"
+
+'⚡️ Component unit tests on PHP 8.5':
+  <<: [ *default-job-settings-lint, *default-component-unit-test-job-settings ]
+  allow_failure: true
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+    _TARGET_PHP: "8.5-ubuntu"
+
 '✅️ PHPStan rules tests':
   <<: [ *default-job-settings-lint ]
   stage: 🪄 Lint

.gitlab-ci/pipeline.yml

-# cspell:ignore drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB
+# cspell:ignore drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB fastzip
 
 stages:
   - 🗜️ Test
@@ -58,6 +58,7 @@ default:
 
 variables:
   FF_NETWORK_PER_BUILD: 1
+  FF_USE_FASTZIP: 1
   SIMPLETEST_BASE_URL: http://localhost/subdirectory
   DB_DRIVER: mysql
   MYSQL_ROOT_PASSWORD: root
@@ -71,19 +72,20 @@ variables:
   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
+  PHPUNIT_FAIL_ON_PHPUNIT_DEPRECATION: false
 
 .with-database: &with-database
   name: $_CONFIG_DOCKERHUB_ROOT/$_TARGET_DB:production
   alias: database
 
 .with-chrome: &with-chrome
-  name: $_CONFIG_DOCKERHUB_ROOT/chromedriver:production
+  name: $_CONFIG_DOCKERHUB_ROOT/webdriver-chromedriver:production
   alias: chrome
   entrypoint:
     - chromedriver
     - "--no-sandbox"
     - "--log-path=/builds/chromedriver.log"
-    - "--whitelisted-ips="
+    - "--allowed-ips="
     - "--allowed-origins=*"
 
 .with-selenium-chrome: &with-selenium-chrome
@@ -100,8 +102,9 @@ variables:
 
 .run-tests: &run-tests
   script:
+    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check
     # Need to pass this along directly.
-    - 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
+    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --debug-discovery --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:
@@ -113,7 +116,7 @@ variables:
         echo '   "Key" to "REPEAT_TEST_CLASS" and "Value" to "Drupal\Tests\ckeditor5\FunctionalJavascript\MediaLinkabilityTest"';
         exit 1;
       else
-        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
+        sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --concurrency "$CONCURRENCY" --repeat "$REPEAT_COUNT" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --class $REPEAT_TEST_CLASS
       fi
 
 ################
@@ -229,8 +232,9 @@ variables:
     - <<: *with-database
     - <<: *with-chrome
   script:
+    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check
     # 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
+    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --debug-discovery --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
@@ -242,8 +246,10 @@ variables:
   allow_failure: true
   variables:
     REPEAT_TEST_CLASS: 'Drupal\Tests\Change\Me'
+    REPEAT_COUNT: 100
   services:
     - <<: *with-database
+    - <<: *with-selenium-chrome
 
 '🚲 Performance tests':
   <<: [ *default-job-settings ]

.gitlab-ci/scripts/.empty-phpstan-baseline.php

+<?php
+
+return [];

.gitlab-ci/scripts/component-coverage-metrics.php

+#!/usr/bin/env php
+<?php
+
+/**
+ * @file
+ * Drupal's Component test coverage metrics.
+ */
+
+if (PHP_SAPI !== 'cli') {
+  return;
+}
+
+$reportFilePath = __DIR__ . '/../../component-coverage-report.txt';
+$metricsFilePath = __DIR__ . '/../../component-coverage-metrics.txt';
+
+$report = @file_get_contents($reportFilePath);
+if (empty($report)) {
+  exit(0);
+}
+
+// Dump the report to STDOUT, with colors, for humans.
+echo $report;
+
+// Remove ANSI color codes and replace the file.
+$output = preg_replace('/\x1b\[\d+(?:;\d+)*m/', '', $report);
+file_put_contents($reportFilePath, $output);
+
+// Find and report the metrics.
+foreach (explode("\n", $output) as $line) {
+  preg_match('/^\s*(Classes|Methods|Lines):\s+(\d+\.\d+%\s*\([\d\/\s]*\))\s*$/', $line, $m);
+  if (!empty($m)) {
+    $metric = strtolower($m[1]);
+    $metricValue = str_replace(' ', '·', $m[2]);
+    file_put_contents($metricsFilePath, "component.coverage.{$metric} {$metricValue}\n", \FILE_APPEND);
+  }
+}

.gitlab-ci/scripts/phpstan-baseline-statistics.php

+#!/usr/bin/env php
+<?php
+
+/**
+ * @file
+ * PHPStan baseline statistics.
+ */
+
+if (PHP_SAPI !== 'cli') {
+  return;
+}
+
+$ignoreErrors = [];
+require __DIR__ . '/../../core/.phpstan-baseline.php';
+
+$stats = ['__total' => 0];
+foreach ($ignoreErrors as $ignore) {
+  $identifier = $ignore['identifier'] ?? '* not specified *';
+  $count = $ignore['count'] ?? 1;
+  $stats['__total'] += $count;
+  $stats[$identifier] = isset($stats[$identifier]) ? $stats[$identifier] + $count : $count;
+}
+
+echo "----------------------------------------\n";
+echo "PHPStan baseline statistics\n";
+echo "----------------------------------------\n";
+echo sprintf("%6d * Total baselined errors\n", $stats['__total']);
+echo "----------------------------------------\n";
+echo "Breakdown by error identifier:\n";
+file_put_contents(__DIR__ . '/../../phpstan-metrics.txt', 'phpstan-baseline ' . $stats['__total'] . PHP_EOL, FILE_APPEND);
+
+unset($stats['__total']);
+arsort($stats);
+
+foreach ($stats as $identifier => $stat) {
+  echo sprintf("%6d %s\n", $stat, $identifier);
+  file_put_contents(__DIR__ . '/../../phpstan-metrics.txt', 'phpstan-baseline.' . $identifier . ' ' . $stat . PHP_EOL, FILE_APPEND);
+}

.ht.router.php

@@ -44,7 +44,7 @@
   // fallback to index.php.
   do {
     $path = dirname($path);
-    if (preg_match('/\.php$/', $path) && is_file(__DIR__ . $path)) {
+    if (str_ends_with($path, '.php') && is_file(__DIR__ . $path)) {
       // Discovered that the path contains an existing PHP file. Use that as the
       // script to include.
       $script = ltrim($path, '/');

SECURITY.md

+# Drupal Security Policy
+
+If you discover a security vulnerability in Drupal core or a contributed project
+(module, theme, or distribution) keep it confidential and [report it to the Drupal security team](https://www.drupal.org/docs/develop/issues/issue-procedures-and-etiquette/reporting-a-security-issue).

composer.json

@@ -12,6 +12,7 @@
         "composer/installers": "^2.3",
         "drupal/core": "self.version",
         "drupal/core-project-message": "self.version",
+        "drupal/core-recipe-unpack": "self.version",
         "drupal/core-vendor-hardening": "self.version"
     },
     "require-dev": {
@@ -19,27 +20,27 @@
         "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
         "composer/composer": "^2.8.1",
-        "drupal/coder": "^8.3.10",
-        "justinrainbow/json-schema": "^5.2",
+        "drupal/coder": "^8.3.30",
+        "justinrainbow/json-schema": "^5.2 || ^6.3",
         "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",
+        "mglaman/phpstan-drupal": "^2.0.7",
+        "micheh/phpcs-gitlab": "^1.1 || ^2.0",
         "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.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"
+        "phpstan/phpstan": "^2.1.17",
+        "phpstan/phpstan-phpunit": "^2.0.6",
+        "phpunit/phpunit": "^10.5.19 || ^11.5.3",
+        "symfony/browser-kit": "^7.3",
+        "symfony/css-selector": "^7.3",
+        "symfony/dom-crawler": "^7.3",
+        "symfony/error-handler": "^7.3",
+        "symfony/lock": "^7.3",
+        "symfony/var-dumper": "^7.3"
     },
     "replace": {
         "symfony/polyfill-php72": "*",
@@ -62,6 +63,7 @@
             "composer/installers": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-project-message": true,
+            "drupal/core-recipe-unpack": true,
             "drupal/core-vendor-hardening": true,
             "php-http/discovery": true,
             "phpstan/extension-installer": true,
@@ -86,6 +88,9 @@
             "modules/custom/{$name}": ["type:drupal-custom-module"],
             "themes/custom/{$name}": ["type:drupal-custom-theme"]
         },
+        "drupal-recipe-unpack": {
+            "on-require": false
+        },
         "drupal-core-project-message": {
             "post-install-cmd-message": [
                 "<bg=blue;fg=white>drupal/drupal</>: This package is meant for core development,",
@@ -128,14 +133,22 @@
     "repositories": [
         {
             "type": "path",
+            "canonical": false,
             "url": "core"
         },
         {
             "type": "path",
+            "canonical": false,
+            "url": "composer/Plugin/RecipeUnpack"
+        },
+        {
+            "type": "path",
+            "canonical": false,
             "url": "composer/Plugin/ProjectMessage"
         },
         {
             "type": "path",
+            "canonical": false,
             "url": "composer/Plugin/VendorHardening"
         },
         {

composer/Metapackage/CoreRecommended/composer.json

@@ -8,22 +8,22 @@
     },
     "require": {
         "drupal/core": "11.x-dev",
-        "asm89/stack-cors": "~v2.2.0",
+        "asm89/stack-cors": "~v2.3.0",
         "composer/semver": "~3.4.3",
         "doctrine/annotations": "~2.0.2",
-        "doctrine/deprecations": "~1.1.3",
+        "doctrine/deprecations": "~1.1.5",
         "doctrine/lexer": "~2.1.1",
-        "egulias/email-validator": "~4.0.2",
-        "guzzlehttp/guzzle": "~7.9.2",
-        "guzzlehttp/promises": "~2.0.4",
-        "guzzlehttp/psr7": "~2.7.0",
+        "egulias/email-validator": "~4.0.4",
+        "guzzlehttp/guzzle": "~7.9.3",
+        "guzzlehttp/promises": "~2.2.0",
+        "guzzlehttp/psr7": "~2.7.1",
         "masterminds/html5": "~2.9.0",
-        "mck89/peast": "~v1.16.3",
+        "mck89/peast": "~v1.17.0",
         "pear/archive_tar": "~1.5.0",
         "pear/console_getopt": "~v1.4.3",
         "pear/pear-core-minimal": "~v1.10.16",
         "pear/pear_exception": "~v1.0.2",
-        "php-tuf/composer-stager": "~v2.0.0",
+        "php-tuf/composer-stager": "~v2.0.1",
         "psr/cache": "~3.0.0",
         "psr/container": "~2.0.2",
         "psr/event-dispatcher": "~1.0.0",
@@ -31,37 +31,38 @@
         "psr/http-factory": "~1.1.0",
         "psr/log": "~3.0.2",
         "ralouphie/getallheaders": "~3.0.3",
-        "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"
+        "revolt/event-loop": "~v1.0.7",
+        "sebastian/diff": "~6.0.2",
+        "symfony/console": "~v7.3.0",
+        "symfony/dependency-injection": "~v7.3.0",
+        "symfony/deprecation-contracts": "~v3.6.0",
+        "symfony/error-handler": "~v7.3.0",
+        "symfony/event-dispatcher": "~v7.3.0",
+        "symfony/event-dispatcher-contracts": "~v3.6.0",
+        "symfony/filesystem": "~v7.3.0",
+        "symfony/finder": "~v7.3.0",
+        "symfony/http-foundation": "~v7.3.0",
+        "symfony/http-kernel": "~v7.3.0",
+        "symfony/mailer": "~v7.3.0",
+        "symfony/mime": "~v7.3.0",
+        "symfony/polyfill-ctype": "~v1.32.0",
+        "symfony/polyfill-iconv": "~v1.32.0",
+        "symfony/polyfill-intl-grapheme": "~v1.32.0",
+        "symfony/polyfill-intl-idn": "~v1.32.0",
+        "symfony/polyfill-intl-normalizer": "~v1.32.0",
+        "symfony/polyfill-mbstring": "~v1.32.0",
+        "symfony/polyfill-php84": "~v1.32.0",
+        "symfony/process": "~v7.3.0",
+        "symfony/psr-http-message-bridge": "~v7.3.0",
+        "symfony/routing": "~v7.3.0",
+        "symfony/serializer": "~v7.3.0",
+        "symfony/service-contracts": "~v3.6.0",
+        "symfony/string": "~v7.3.0",
+        "symfony/translation-contracts": "~v3.6.0",
+        "symfony/validator": "~v7.3.0",
+        "symfony/var-dumper": "~v7.3.0",
+        "symfony/var-exporter": "~v7.3.0",
+        "symfony/yaml": "~v7.3.0",
+        "twig/twig": "~v3.21.1"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -11,26 +11,26 @@
         "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
         "composer/composer": "^2.8.1",
-        "drupal/coder": "^8.3.10",
-        "justinrainbow/json-schema": "^5.2",
+        "drupal/coder": "^8.3.30",
+        "justinrainbow/json-schema": "^5.2 || ^6.3",
         "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",
+        "mglaman/phpstan-drupal": "^2.0.7",
+        "micheh/phpcs-gitlab": "^1.1 || ^2.0",
         "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.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"
+        "phpstan/phpstan": "^2.1.17",
+        "phpstan/phpstan-phpunit": "^2.0.6",
+        "phpunit/phpunit": "^10.5.19 || ^11.5.3",
+        "symfony/browser-kit": "^7.3",
+        "symfony/css-selector": "^7.3",
+        "symfony/dom-crawler": "^7.3",
+        "symfony/error-handler": "^7.3",
+        "symfony/lock": "^7.3",
+        "symfony/var-dumper": "^7.3"
     }
 }

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -10,34 +10,35 @@
         "drupal/core": "11.x-dev",
         "behat/mink": "v1.12.0",
         "behat/mink-browserkit-driver": "v2.2.0",
-        "brick/math": "0.12.1",
+        "brick/math": "0.12.3",
         "colinodell/psr-testlogger": "v1.3.0",
-        "composer/ca-bundle": "1.5.4",
-        "composer/class-map-generator": "1.5.0",
-        "composer/composer": "2.8.3",
+        "composer/ca-bundle": "1.5.6",
+        "composer/class-map-generator": "1.6.1",
+        "composer/composer": "2.8.9",
         "composer/metadata-minifier": "1.0.0",
         "composer/pcre": "3.3.2",
         "composer/spdx-licenses": "1.5.8",
         "composer/xdebug-handler": "3.0.5",
         "dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
         "doctrine/instantiator": "2.0.0",
-        "drupal/coder": "8.3.26",
-        "google/protobuf": "v4.29.1",
-        "justinrainbow/json-schema": "5.3.0",
+        "drupal/coder": "8.3.30",
+        "google/protobuf": "v4.31.1",
+        "justinrainbow/json-schema": "6.4.2",
         "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",
+        "marc-mabe/php-enum": "v4.7.1",
+        "mglaman/phpstan-drupal": "2.0.7",
+        "micheh/phpcs-gitlab": "2.0.0",
         "mikey179/vfsstream": "v1.6.12",
-        "myclabs/deep-copy": "1.12.1",
-        "nikic/php-parser": "v5.3.1",
+        "myclabs/deep-copy": "1.13.1",
+        "nikic/php-parser": "v5.4.0",
         "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",
+        "open-telemetry/api": "1.3.0",
+        "open-telemetry/context": "1.2.1",
+        "open-telemetry/exporter-otlp": "1.3.1",
+        "open-telemetry/gen-otlp-protobuf": "1.5.0",
+        "open-telemetry/sdk": "1.5.0",
+        "open-telemetry/sem-conv": "1.32.0",
         "phar-io/manifest": "2.0.4",
         "phar-io/version": "3.2.1",
         "php-http/discovery": "1.20.0",
@@ -45,49 +46,50 @@
         "php-http/httplug": "2.4.1",
         "php-http/promise": "1.3.1",
         "phpdocumentor/reflection-common": "2.2.0",
-        "phpdocumentor/reflection-docblock": "5.6.1",
+        "phpdocumentor/reflection-docblock": "5.6.2",
         "phpdocumentor/type-resolver": "1.10.0",
-        "phpspec/prophecy": "v1.20.0",
+        "phpspec/prophecy": "v1.22.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",
+        "phpstan/phpdoc-parser": "2.1.0",
+        "phpstan/phpstan": "2.1.17",
+        "phpstan/phpstan-deprecation-rules": "2.0.3",
+        "phpstan/phpstan-phpunit": "2.0.6",
+        "phpunit/php-code-coverage": "11.0.9",
+        "phpunit/php-file-iterator": "5.1.0",
+        "phpunit/php-invoker": "5.0.1",
+        "phpunit/php-text-template": "4.0.1",
+        "phpunit/php-timer": "7.0.1",
+        "phpunit/phpunit": "11.5.22",
+        "ramsey/collection": "2.1.1",
+        "ramsey/uuid": "4.8.1",
         "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",
+        "sebastian/cli-parser": "3.0.2",
+        "sebastian/code-unit": "3.0.3",
+        "sebastian/code-unit-reverse-lookup": "4.0.1",
+        "sebastian/comparator": "6.3.1",
+        "sebastian/complexity": "4.0.1",
+        "sebastian/environment": "7.2.1",
+        "sebastian/exporter": "6.3.0",
+        "sebastian/global-state": "7.0.2",
+        "sebastian/lines-of-code": "3.0.1",
+        "sebastian/object-enumerator": "6.0.1",
+        "sebastian/object-reflector": "4.0.1",
+        "sebastian/recursion-context": "6.0.2",
+        "sebastian/type": "5.1.2",
+        "sebastian/version": "5.0.2",
         "seld/jsonlint": "1.11.0",
         "seld/phar-utils": "1.2.1",
         "seld/signal-handler": "2.0.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",
+        "sirbrillig/phpcs-variable-analysis": "v2.12.0",
+        "slevomat/coding-standard": "8.18.1",
+        "squizlabs/php_codesniffer": "3.13.0",
+        "staabm/side-effects-detector": "1.0.5",
+        "symfony/browser-kit": "v7.3.0",
+        "symfony/css-selector": "v7.3.0",
+        "symfony/dom-crawler": "v7.3.0",
+        "symfony/lock": "v7.3.0",
+        "tbachert/spi": "v1.0.3",
         "theseer/tokenizer": "1.2.3",
         "webflo/drupal-finder": "1.3.1",
         "webmozart/assert": "1.11.0"

composer/Plugin/RecipeUnpack/CommandProvider.php

+<?php
+
+namespace Drupal\Composer\Plugin\RecipeUnpack;
+
+use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability;
+
+/**
+ * List of all commands provided by this package.
+ *
+ * @internal
+ */
+final class CommandProvider implements CommandProviderCapability {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCommands(): array {
+    return [new UnpackCommand()];
+  }
+
+}

composer/Plugin/RecipeUnpack/SemVer.php

+<?php
+
+namespace Drupal\Composer\Plugin\RecipeUnpack;
+
+use Composer\Semver\Constraint\MatchNoneConstraint;
+use Composer\Semver\Constraint\MultiConstraint;
+use Composer\Semver\Intervals;
+use Composer\Semver\VersionParser;
+
+/**
+ * Helper class to manipulate semantic versioning constraints.
+ *
+ * @internal
+ */
+final class SemVer {
+
+  private function __construct() {}
+
+  /**
+   * Minimizes two constraints.
+   *
+   * Compares two constraints and determines if one is a subset of the other. If
+   * this is the case, the constraint that is a subset is returned. For example,
+   * if called with '^6.2' and '^6.3' the function will return '^6.3'. If
+   * neither constraint is a subset then the constraints are compacted and the
+   * intersection is returned. For example, if called with ">=10.3" and
+   * "^10.4 || ^11" the function will return ">=10.4.0.0-dev, <12.0.0.0-dev".
+   *
+   * @param \Composer\Semver\VersionParser $version_parser
+   *   A version parser.
+   * @param string $constraint_a
+   *   A constraint to compact.
+   * @param string $constraint_b
+   *   A constraint to compact.
+   *
+   * @return string
+   *   The compacted constraint.
+   *
+   * @throws \LogicException
+   *   Thrown when the provided constraints have no intersection.
+   */
+  public static function minimizeConstraints(VersionParser $version_parser, string $constraint_a, string $constraint_b): string {
+    $constraint_object_a = $version_parser->parseConstraints($constraint_a);
+    $constraint_object_b = $version_parser->parseConstraints($constraint_b);
+    if (Intervals::isSubsetOf($constraint_object_a, $constraint_object_b)) {
+      return $constraint_a;
+    }
+    if (Intervals::isSubsetOf($constraint_object_b, $constraint_object_a)) {
+      return $constraint_b;
+    }
+    $constraint = Intervals::compactConstraint(new MultiConstraint([$constraint_object_a, $constraint_object_b]));
+    if ($constraint instanceof MatchNoneConstraint) {
+      throw new \LogicException(sprintf('The constraints "%s" and "%s" do not intersect and cannot be minimized.', $constraint_a, $constraint_b));
+    }
+    return sprintf(
+      '%s%s, %s%s',
+      $constraint->getLowerBound()->isInclusive() ? '>=' : '>',
+      $constraint->getLowerBound()->getVersion(),
+      $constraint->getUpperBound()->isInclusive() ? '<=' : '<',
+      $constraint->getUpperBound()->getVersion()
+    );
+  }
+
+}