.gitattributes

@@ -48,6 +48,7 @@ core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-sp
 # 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.yml

-# cspell:ignore codequality Micheh micheh webide updatedb stylelintrc unshallow
+# cspell:ignore codequality Micheh micheh webide testdox updatedb stylelintrc
 
 ################
 # Drupal GitLabCI template.
@@ -58,6 +58,7 @@ workflow:
 variables:
   _CONFIG_DOCKERHUB_ROOT: "drupalci"
   CACHE_TARGET: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}"
+  CORE_GITLAB_PROJECT_ID: 59858
   # Let composer know what self.version means.
   COMPOSER_ROOT_VERSION: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}-dev"
   COMPOSER_ALLOW_SUPERUSER: 1
@@ -102,36 +103,64 @@ default:
   rules:
     - if: $PERFORMANCE_TEST != "1"
 
+.default-phpunit-job-settings: &default-phpunit-job-settings
+  stage: 🪄 Lint
+  before_script:
+    - composer validate
+    - composer install --optimize-autoloader
+    - 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:
+    - 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" --verbose --non-html --all
+  after_script:
+    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
+  artifacts:
+    when: always
+    expire_in: 6 mos
+    reports:
+      junit: ./sites/default/files/simpletest/phpunit-*.xml
+    paths:
+      - ./sites/default/files/simpletest/phpunit-*.xml
+
+.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,
+  # stable path.
+  # See https://github.com/phpstan/phpstan/issues/8599
+  - mkdir /build;
+  - cp -Ria $CI_PROJECT_DIR/* /build/
+  - cd /build
+
 .phpstan-cache: &phpstan-cache
   # Get the phpstan cache file from the artifacts of the latest successful
   # job from the target branch. Allow the job to proceed and pass if the file
   # doesn't exist.
   - mkdir core/phpstan-tmp
-  - 'curl --location --output core/phpstan-tmp/resultCache.php "https://git.drupalcode.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/{$CACHE_TARGET}/raw/core/phpstan-tmp/resultCache.php?job=Lint%20cache%20warming" || true'
+  - 'curl --location --output core/phpstan-tmp/resultCache.php "https://git.drupalcode.org/api/v4/projects/{$CORE_GITLAB_PROJECT_ID}/jobs/artifacts/{$CACHE_TARGET}/raw/core/phpstan-tmp/resultCache.php?job=Lint%20cache%20warming" || true'
 
 .cspell-cache: &cspell-cache
   # Fetch the cspell cache from the artifacts of the latest successful job from
   # the target branch. Allow the job to proceed and pass if the file doesn't
   # exist.
-  - 'curl --location --output core/.cspellcache "https://git.drupalcode.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/{$CACHE_TARGET}/raw/core/.cspellcache?job=Lint%20cache%20warming" || true'
+  - 'curl --location --output core/.cspellcache "https://git.drupalcode.org/api/v4/projects/{$CORE_GITLAB_PROJECT_ID}/jobs/artifacts/{$CACHE_TARGET}/raw/core/.cspellcache?job=Lint%20cache%20warming" || true'
 
 .eslint-cache: &eslint-cache
   # Fetch the eslint cache from the artifacts of the latest successful job from
   # the target branch. Allow the job to proceed and pass if the file doesn't
   # exist.
-  - 'curl --location --output core/.eslintcache "https://git.drupalcode.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/{$CACHE_TARGET}/raw/core/.eslintcache?job=Lint%20cache%20warming" || true'
+  - 'curl --location --output core/.eslintcache "https://git.drupalcode.org/api/v4/projects/{$CORE_GITLAB_PROJECT_ID}/jobs/artifacts/{$CACHE_TARGET}/raw/core/.eslintcache?job=Lint%20cache%20warming" || true'
 
 .stylelint-cache: &stylelint-cache
   # Fetch the stylelint cache from the artifacts of the latest successful job from
   # the target branch. Allow the job to proceed and pass if the file doesn't
   # exist.
-  - 'curl --location --output core/.stylelintcache "https://git.drupalcode.org/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/{$CACHE_TARGET}/raw/core/.stylelintcache?job=Lint%20cache%20warming" || true'
+  - 'curl --location --output core/.stylelintcache "https://git.drupalcode.org/api/v4/projects/{$CORE_GITLAB_PROJECT_ID}/jobs/artifacts/{$CACHE_TARGET}/raw/core/.stylelintcache?job=Lint%20cache%20warming" || true'
 
 .core-spellcheck: &core-spellcheck
   - cd core
   - corepack enable
   - yarn install
-  - yarn run spellcheck:core --no-must-find-files --cache --cache-strategy content
+  - yarn run spellcheck:core --no-progress --no-must-find-files --cache --cache-strategy content
 ################
 # Stages
 #
@@ -167,13 +196,12 @@ default:
       allow_failure: true
 
 # Default configuration.
-'DEFAULT: PHP 8.3 MySQL 8':
+'DEFAULT: PHP 8.3 MySQL 8.0':
   <<: *default-stage
   variables:
     _TARGET_PHP: "8.3-ubuntu"
     _TARGET_DB: "mysql-8"
     PERFORMANCE_TEST: $PERFORMANCE_TEST
-    OTEL_COLLECTOR: $OTEL_COLLECTOR
   # Run on MR, schedule, push, parent pipeline and performance test.
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
@@ -185,7 +213,7 @@ default:
     - if: $PERFORMANCE_TEST == "1"
 
 # Re-run the pipeline, but with Composer updates.
-'DEFAULT: Updated dependencies (PHP 8.3 MySQL 8)':
+'DEFAULT: Updated dependencies (PHP 8.3 MySQL 8.0)':
   <<: *default-stage
   # Run daily and allow manual runs on MRs.
   rules:
@@ -200,7 +228,7 @@ default:
     include: .gitlab-ci.yml
 
 # Special job for MRs for test-only checks.
-'DEFAULT: Test-only (PHP 8.3 MySQL 8)':
+'DEFAULT: Test-only (PHP 8.3 MySQL 8.0)':
   <<: [ *default-stage, *with-composer ]
   when: manual
   allow_failure: true
@@ -224,23 +252,47 @@ default:
     _TARGET_PHP: "8.3-ubuntu"
     _TARGET_DB: "mariadb-10.6"
 
+'PHP 8.3 MySQL 8.4':
+  <<: [ *default-stage, *run-on-mr ]
+  variables:
+    _TARGET_PHP: "8.3-ubuntu"
+    _TARGET_DB: "mysql-8.4"
+
+'PHP 8.4 MySQL 9.2':
+  <<: [ *default-stage, *run-on-mr ]
+  variables:
+    _TARGET_PHP: "8.4-ubuntu"
+    _TARGET_DB: "mysql-9"
+
 'PHP 8.3 PostgreSQL 16':
   <<: [ *default-stage, *run-on-mr ]
   variables:
     _TARGET_PHP: "8.3-ubuntu"
     _TARGET_DB: "pgsql-16"
 
+'PHP 8.4 PostgreSQL 17':
+  <<: [ *default-stage, *run-on-mr ]
+  variables:
+    _TARGET_PHP: "8.4-ubuntu"
+    _TARGET_DB: "pgsql-17"
+
 'PHP 8.3 SQLite 3.45':
   <<: [ *default-stage, *run-on-mr ]
   variables:
     _TARGET_PHP: "8.3-ubuntu"
     _TARGET_DB: "sqlite-3"
 
+'PHP 8.4 MySQL 8.4':
+  <<: [ *default-stage, *run-on-mr ]
+  variables:
+    _TARGET_PHP: "8.4-ubuntu"
+    _TARGET_DB: "mysql-8.4"
+
 # Jobs running on commits.
 # The value set in the "needs" property will determine the order in the sequence.
 '[Commit] PHP 8.3 PostgreSQL 16':
   extends: 'PHP 8.3 PostgreSQL 16'
-  needs: [ 'DEFAULT: PHP 8.3 MySQL 8' ]
+  needs: [ 'DEFAULT: PHP 8.3 MySQL 8.0' ]
   <<: [ *run-on-commit ]
 
 '[Commit] PHP 8.3 SQLite 3.45':
@@ -252,7 +304,7 @@ default:
 # The value set in the "needs" property will determine the order in the sequence.
 '[Daily] PHP 8.3 PostgreSQL 16':
   extends: 'PHP 8.3 PostgreSQL 16'
-  needs: [ 'DEFAULT: PHP 8.3 MySQL 8' ]
+  needs: [ 'DEFAULT: PHP 8.3 MySQL 8.0' ]
   <<: [ *run-daily ]
 
 '[Daily] PHP 8.3 SQLite 3.45':
@@ -265,39 +317,69 @@ default:
   needs: [ '[Daily] PHP 8.3 SQLite 3.45' ]
   <<: [ *run-daily ]
 
+'[Daily] PHP 8.4 MySQL 8.4':
+  extends: 'PHP 8.4 MySQL 8.4'
+  needs: [ '[Daily] PHP 8.3 MariaDB 10.6' ]
+  <<: [ *run-daily ]
+
+'[Daily] PHP 8.4 PostgreSQL 17':
+  extends: 'PHP 8.4 PostgreSQL 17'
+  needs: [ '[Daily] PHP 8.4 MySQL 8.4' ]
+  <<: [ *run-daily ]
+
 ################
 # 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/
 
-'Lint cache warming':
+'📔 Spell-checking':
   <<: [ *default-job-settings-lint ]
   stage: 🪄 Lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project" && $DAILY_TEST == "1"
-    - when: manual
-      allow_failure: true
   variables:
-    KUBERNETES_CPU_REQUEST: "4"
+    KUBERNETES_CPU_REQUEST: "2"
   script:
-    - *phpstan-cache
+    - *prepare-lint-directory
     - *cspell-cache
-    - *eslint-cache
-    - *stylelint-cache
-    - composer install
-    - vendor/bin/phpstan --version
-    - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist
     - *core-spellcheck
-    - yarn run lint:core-js-passing --cache --cache-strategy content
-    - yarn run build:css --check
-    - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content
+    - 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/phpstan-tmp/resultCache.php
-      - core/.cspellcache
-      - core/.eslintcache
-      - core/.stylelintcache
+      - core/node_modules/
 
 '🧹 PHP Static Analysis (phpstan)':
   <<: [ *default-job-settings-lint ]
@@ -305,6 +387,7 @@ default:
   variables:
     KUBERNETES_CPU_REQUEST: "4"
   script:
+    - *prepare-lint-directory
     - *phpstan-cache
     - composer validate
     - composer install --optimize-autoloader
@@ -315,15 +398,15 @@ default:
     - vendor/bin/phpstan --version
     # Rely on PHPStan caching to execute analysis multiple times without performance drawback.
     # Output a copy in junit.
-    - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json || EXIT_CODE=$?
-    - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist --no-progress --error-format=junit > phpstan-junit.xml || true
+    - 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
     - |
       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)."
-        php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --no-progress --generate-baseline=./core/.phpstan-baseline.php || true
+        php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --no-progress --generate-baseline=$CI_PROJECT_DIR/core/.phpstan-baseline.php || true
         exit $EXIT_CODE
       fi
 
@@ -376,6 +459,7 @@ default:
     - when: manual
       allow_failure: true
   script:
+    - *prepare-lint-directory
     - *eslint-cache
     - cd core
     - corepack enable
@@ -403,36 +487,67 @@ default:
     - when: manual
       allow_failure: true
   script:
+    - *prepare-lint-directory
     - *stylelint-cache
     - corepack enable
     - cd core
     - yarn install
     - yarn run build:css --check
-    - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content --color --custom-formatter=node_modules/stylelint-formatter-gitlab
+    - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content --color  --custom-formatter=@gitlab-formatters/stylelint-formatter-gitlab --output-file=$CI_PROJECT_DIR/gl-codequality.json
   artifacts:
     reports:
-      codequality: stylelint-quality-report.json
+      codequality: gl-codequality.json
 
-'📔 Spell-checking':
+'⚡️ PHPUnit Unit tests on PHP 8.3':
+  <<: [ *default-job-settings-lint, *default-phpunit-job-settings ]
+  variables:
+    TESTSUITE: PHPUnit-Unit
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: 24
+    _TARGET_PHP: "8.3-ubuntu"
+
+'⚡️ PHPUnit Unit tests on PHP 8.4':
+  <<: [ *default-job-settings-lint, *default-phpunit-job-settings ]
+  variables:
+    TESTSUITE: PHPUnit-Unit
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: 24
+    _TARGET_PHP: "8.4-ubuntu"
+
+'⚡️ PHPUnit Unit tests on PHP 8.5':
+  <<: [ *default-job-settings-lint, *default-phpunit-job-settings ]
+  allow_failure: true
+  variables:
+    TESTSUITE: PHPUnit-Unit
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: 24
+    _TARGET_PHP: "8.5-ubuntu"
+
+'✅️ PHPStan rules tests':
   <<: [ *default-job-settings-lint ]
   stage: 🪄 Lint
   variables:
     KUBERNETES_CPU_REQUEST: "2"
+  # Run if PHPStan files have changed, or manually.
+  rules:
+    - if: $PERFORMANCE_TEST != "1"
+      changes:
+        - core/tests/PHPStan/**/*
+        - composer/Metapackage/PinnedDevDependencies/composer.json
+    - when: manual
+      allow_failure: true
   script:
-    - *cspell-cache
-    - *core-spellcheck
-  cache:
-    key:
-      files:
-        - ./core/package.json
-        - ./core/yarn.lock
-    paths:
-      - ./core/node_modules
+    - docker-php-ext-enable pcov
+    - cd core/tests/PHPStan
+    - composer install
+    - vendor/bin/phpunit tests --testdox --coverage-text --colors=always --coverage-cobertura=coverage.cobertura.xml --log-junit junit.xml
   artifacts:
-    expire_in: 1 week
-    expose_as: 'yarn-vendor'
-    paths:
-      - core/node_modules/
+    when: always
+    reports:
+      junit: core/tests/PHPStan/junit.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: core/tests/PHPStan/coverage.cobertura.xml
 
 '📔 Validatable config':
   <<: [ *default-job-settings-lint ]
@@ -478,7 +593,7 @@ default:
     - vendor/bin/drush config:inspect --statistics > HEAD.json
     # Return to the MR commit being tested, conditionally install updates, always rebuild the container.
     - git checkout -f $CI_COMMIT_SHA
-    - git diff $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_COMMIT_SHA --name-only | grep -q '.install$\|.post_update\.php$' && echo '🤖 Installing DB updates…' && vendor/bin/drush updatedb --yes --quiet
+    - git diff $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_COMMIT_SHA --name-only | grep -q '.install$\|.post_update\.php$' && echo '🤖 Installing DB updates…' && vendor/bin/drush updatedb --yes
     - vendor/bin/drush cr --quiet
     # Compute statistics for coverage of validatable config for MR.
     - vendor/bin/drush config:inspect --statistics > MR.json
@@ -494,3 +609,36 @@ default:
          $impact = array_map(fn (float $h, float $m) => $m-$h, $head, $mr);
          exit((int) (min($impact) < 0));
       '
+
+'Lint cache warming':
+  <<: [ *default-job-settings-lint ]
+  stage: 🪄 Lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project" && $DAILY_TEST == "1"
+  variables:
+    KUBERNETES_CPU_REQUEST: "4"
+  script:
+    - *prepare-lint-directory
+    - *phpstan-cache
+    - *cspell-cache
+    - *eslint-cache
+    - *stylelint-cache
+    - composer install
+    - vendor/bin/phpstan --version
+    - php vendor/bin/phpstan -vvv analyze --configuration=./core/phpstan.neon.dist
+    - *core-spellcheck
+    - yarn run lint:core-js-passing --cache --cache-strategy content
+    - yarn run build:css --check
+    - yarn run lint:css --cache --cache-location .stylelintcache --cache-strategy content
+    - mv -f /build/core/phpstan-tmp $CI_PROJECT_DIR/core
+    - mv -f /build/core/.cspellcache $CI_PROJECT_DIR/core
+    - mv -f  /build/core/.eslintcache $CI_PROJECT_DIR/core
+    - mv -f  /build/core/.stylelintcache $CI_PROJECT_DIR/core
+  artifacts:
+    paths:
+      - core/phpstan-tmp/resultCache.php
+      - core/.cspellcache
+      - core/.eslintcache
+      - core/.stylelintcache
+

.gitlab-ci/pipeline.yml

-# cspell:ignore cobertura drupaltestbot drupaltestbotpw Dwebdriver logfile testdox XVFB
+# cspell:ignore drupaltestbot drupaltestbotpw Dwebdriver logfile XVFB
 
 stages:
   - 🗜️ Test
@@ -87,21 +87,21 @@ variables:
     - "--allowed-origins=*"
 
 .with-selenium-chrome: &with-selenium-chrome
-  name: selenium/standalone-chrome:latest
+  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: "10"
-    SE_START_XVFB: "false"
+    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:
@@ -113,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
 
 ################
@@ -132,17 +132,17 @@ 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: 8
-    KUBERNETES_CPU_REQUEST: "24"
+    CONCURRENCY: 5
+    KUBERNETES_CPU_REQUEST: "16"
   services:
     - <<: *with-database
     - <<: *with-selenium-chrome
@@ -151,92 +151,35 @@ variables:
     - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
     - cp /builds/chromedriver.log ./
 
-'🖱️️️ PHPUnit Functional Javascript (non W3C legacy)':
-  <<: [ *with-composer, *default-job-settings ]
-  parallel: 1
+'👷️️️ PHPUnit Build':
+  <<: [ *with-composer, *run-tests, *default-job-settings ]
   variables:
-    TESTSUITE: PHPUnit-FunctionalJavascript
-    CONCURRENCY: 15
-    KUBERNETES_CPU_REQUEST: "24"
-    MINK_DRIVER_ARGS_WEBDRIVER: $MINK_DRIVER_ARGS_WEBDRIVER_CHROMEDRIVER_NON_W3C
+    TESTSUITE: PHPUnit-Build
+    KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: "5"
   services:
     - <<: *with-database
-    - <<: *with-chrome
-  script:
-    # Run a small subset of tests to prove non W3C testing still works.
-    - 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 javascript
-
-  after_script:
-    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
-    - cp /builds/chromedriver.log ./
 
 '🌐️️ PHPUnit Functional':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
-  parallel: 7
+  parallel: 8
   variables:
     TESTSUITE: PHPUnit-Functional
-    KUBERNETES_CPU_REQUEST: "24"
+    CONCURRENCY: "5"
+    KUBERNETES_CPU_REQUEST: "16"
   services:
     - <<: *with-database
 
 '⚙️️ PHPUnit Kernel':
   <<: [ *with-composer, *run-tests, *default-job-settings ]
-  parallel: 4
+  parallel: 5
   variables:
     TESTSUITE: PHPUnit-Kernel
     KUBERNETES_CPU_REQUEST: "8"
+    CONCURRENCY: 12
   services:
     - <<: *with-database
 
-'👷️️️ PHPUnit Build':
-  <<: [ *with-composer, *run-tests, *default-job-settings ]
-  variables:
-    TESTSUITE: PHPUnit-Build
-    KUBERNETES_CPU_REQUEST: "2"
-    CONCURRENCY: "4"
-  services:
-    - <<: *with-database
-
-'⚡️ PHPUnit Unit':
-  <<: [ *with-composer, *run-tests, *default-job-settings ]
-  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: "1"
-    CONCURRENCY: 6
-
-'✅️ PHPStan Tests':
-  <<: [ *default-job-settings ]
-  variables:
-    KUBERNETES_CPU_REQUEST: "2"
-  # Run if PHPStan files have changed, or manually.
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "parent_pipeline" && $PERFORMANCE_TEST != "1"
-      changes:
-        - core/tests/PHPStan/*
-        - composer/Metapackage/PinnedDevDependencies/composer.json
-    - when: manual
-      allow_failure: true
-  # Default job settings runs a script that expects vendor to exist.
-  before_script: []
-  script:
-    - docker-php-ext-enable pcov
-    - cd core/tests/PHPStan
-    - composer install
-    - vendor/bin/phpunit tests --testdox --coverage-text --colors=never --coverage-cobertura=coverage.cobertura.xml --log-junit junit.xml
-  # Default job settings runs a script that junit files in a specific location..
-  after_script: []
-  artifacts:
-    when: always
-    reports:
-      junit: core/tests/PHPStan/junit.xml
-      coverage_report:
-        coverage_format: cobertura
-        path: core/tests/PHPStan/coverage.cobertura.xml
-
 '🦉️️️ Nightwatch':
   <<: [ *with-composer-and-yarn, *default-job-settings ]
   variables:
@@ -262,7 +205,7 @@ variables:
     - chown -R www-data:www-data ./sites /var/www
     - cd core
     - corepack enable
-    - sudo -u www-data yarn run test:nightwatch --workers=4
+    - sudo -u www-data -E -H yarn run test:nightwatch --workers=3
   after_script:
     - cp /builds/chromedriver.log ./
   artifacts:
@@ -274,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
@@ -309,4 +271,4 @@ variables:
     - 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 -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

.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

composer.json

@@ -18,28 +18,28 @@
         "behat/mink": "^1.11",
         "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.7.7",
+        "composer/composer": "^2.8.1",
         "drupal/coder": "^8.3.10",
         "justinrainbow/json-schema": "^5.2",
         "lullabot/mink-selenium2-driver": "^1.7.3",
         "lullabot/php-webdriver": "^2.0.5",
-        "mglaman/phpstan-drupal": "^1.2.11",
+        "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.11.10",
-        "phpstan/phpstan-phpunit": "^1.3.16",
+        "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.1",
-        "symfony/css-selector": "^7.1",
-        "symfony/dom-crawler": "^7.1",
-        "symfony/error-handler": "^7.1",
-        "symfony/lock": "^7.1",
-        "symfony/var-dumper": "^7.1"
+        "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": "*",
@@ -60,11 +60,12 @@
         },
         "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": {

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/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,57 +9,59 @@
     "require": {
         "drupal/core": "11.x-dev",
         "asm89/stack-cors": "~v2.2.0",
-        "composer/semver": "~3.4.2",
-        "doctrine/annotations": "~2.0.1",
+        "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.9.2",
-        "guzzlehttp/promises": "~2.0.3",
+        "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.15",
+        "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.1.0",
-        "psr/log": "~3.0.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.1.3",
-        "symfony/dependency-injection": "~v7.1.3",
-        "symfony/deprecation-contracts": "~v3.5.0",
-        "symfony/error-handler": "~v7.1.3",
-        "symfony/event-dispatcher": "~v7.1.1",
-        "symfony/event-dispatcher-contracts": "~v3.5.0",
-        "symfony/filesystem": "~v7.1.2",
-        "symfony/finder": "~v7.1.3",
-        "symfony/http-foundation": "~v7.1.3",
-        "symfony/http-kernel": "~v7.1.3",
-        "symfony/mailer": "~v7.1.2",
-        "symfony/mime": "~v7.1.2",
-        "symfony/polyfill-ctype": "~v1.30.0",
-        "symfony/polyfill-iconv": "~v1.30.0",
-        "symfony/polyfill-intl-grapheme": "~v1.30.0",
-        "symfony/polyfill-intl-idn": "~v1.30.0",
-        "symfony/polyfill-intl-normalizer": "~v1.30.0",
-        "symfony/polyfill-mbstring": "~v1.30.0",
-        "symfony/process": "~v7.1.3",
-        "symfony/psr-http-message-bridge": "~v7.1.3",
-        "symfony/routing": "~v7.1.3",
-        "symfony/serializer": "~v7.1.3",
-        "symfony/service-contracts": "~v3.5.0",
-        "symfony/string": "~v7.1.3",
-        "symfony/translation-contracts": "~v3.5.0",
-        "symfony/validator": "~v7.1.3",
-        "symfony/var-dumper": "~v7.1.3",
-        "symfony/var-exporter": "~v7.1.2",
-        "symfony/yaml": "~v7.1.1",
-        "twig/twig": "~v3.11.0"
+        "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

@@ -10,27 +10,27 @@
         "behat/mink": "^1.11",
         "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.7.7",
+        "composer/composer": "^2.8.1",
         "drupal/coder": "^8.3.10",
         "justinrainbow/json-schema": "^5.2",
         "lullabot/mink-selenium2-driver": "^1.7.3",
         "lullabot/php-webdriver": "^2.0.5",
-        "mglaman/phpstan-drupal": "^1.2.11",
+        "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.11.10",
-        "phpstan/phpstan-phpunit": "^1.3.16",
+        "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.1",
-        "symfony/css-selector": "^7.1",
-        "symfony/dom-crawler": "^7.1",
-        "symfony/error-handler": "^7.1",
-        "symfony/lock": "^7.1",
-        "symfony/var-dumper": "^7.1"
+        "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,61 +8,65 @@
     },
     "require": {
         "drupal/core": "11.x-dev",
-        "behat/mink": "v1.11.0",
+        "behat/mink": "v1.12.0",
         "behat/mink-browserkit-driver": "v2.2.0",
+        "brick/math": "0.12.1",
         "colinodell/psr-testlogger": "v1.3.0",
-        "composer/ca-bundle": "1.5.1",
-        "composer/class-map-generator": "1.3.4",
-        "composer/composer": "2.7.7",
+        "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.2.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.24",
-        "google/protobuf": "v3.25.4",
+        "drupal/coder": "8.3.26",
+        "google/protobuf": "v4.29.1",
         "justinrainbow/json-schema": "5.3.0",
-        "lullabot/mink-selenium2-driver": "v1.7.3",
-        "lullabot/php-webdriver": "v2.0.5",
-        "mglaman/phpstan-drupal": "1.2.12",
+        "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.12.0",
-        "nikic/php-parser": "v5.1.0",
-        "open-telemetry/api": "1.0.3",
-        "open-telemetry/context": "1.0.2",
-        "open-telemetry/exporter-otlp": "1.0.4",
-        "open-telemetry/gen-otlp-protobuf": "1.1.0",
-        "open-telemetry/sdk": "1.0.8",
-        "open-telemetry/sem-conv": "1.27.0",
+        "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.4",
-        "php-http/guzzle7-adapter": "1.0.0",
-        "php-http/httplug": "2.4.0",
+        "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.4.1",
-        "phpdocumentor/type-resolver": "1.8.2",
-        "phpspec/prophecy": "v1.19.0",
-        "phpspec/prophecy-phpunit": "v2.2.0",
-        "phpstan/extension-installer": "1.4.1",
-        "phpstan/phpdoc-parser": "1.29.1",
-        "phpstan/phpstan": "1.11.10",
-        "phpstan/phpstan-deprecation-rules": "1.2.0",
-        "phpstan/phpstan-phpunit": "1.4.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.30",
+        "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.2",
+        "sebastian/comparator": "5.0.3",
         "sebastian/complexity": "3.2.0",
         "sebastian/environment": "6.1.0",
         "sebastian/exporter": "5.1.2",
@@ -76,13 +80,14 @@
         "seld/jsonlint": "1.11.0",
         "seld/phar-utils": "1.2.1",
         "seld/signal-handler": "2.0.2",
-        "sirbrillig/phpcs-variable-analysis": "v2.11.19",
+        "sirbrillig/phpcs-variable-analysis": "v2.11.21",
         "slevomat/coding-standard": "8.15.0",
-        "squizlabs/php_codesniffer": "3.10.2",
-        "symfony/browser-kit": "v7.1.1",
-        "symfony/css-selector": "v7.1.1",
-        "symfony/dom-crawler": "v7.1.1",
-        "symfony/lock": "v7.1.1",
+        "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/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;
 
@@ -195,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/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

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/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();