.gitattributes

@@ -42,6 +42,9 @@
 *.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."

.gitlab-ci.yml

-# cspell:ignore codequality Micheh micheh
+# cspell:ignore codequality Micheh micheh webide updatedb
 
 ################
 # Drupal GitLabCI template.
@@ -12,23 +12,37 @@
 ################
 
 ################
-# Includes
+# Workflow
 #
-# Additional configuration can be provided through includes.
-# One advantage of include files is that if they are updated upstream, the
-# changes affect all pipelines using that include.
+# Define conditions for when the pipeline will run.
+#   For example:
+#     * On commit
+#     * On merge request
+#     * On manual trigger
+#     * etc.
+# https://docs.gitlab.com/ee/ci/jobs/job_control.html#specify-when-jobs-run-with-rules
 #
-# Includes can be overridden by re-declaring anything provided in an include,
-# here in gitlab-ci.yml.
-# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
+# Pipelines can also be configured to run on a schedule,though they still must meet the conditions defined in Workflow and Rules. This can be used, for example, to do nightly regression testing:
+# https://gitlab.com/help/ci/pipelines/schedules
 ################
 
-include:
-  - project: $_GITLAB_TEMPLATES_REPO
-    ref: $_GITLAB_TEMPLATES_REF
-    file:
-      - '/includes/include.drupalci.variables.yml'
-      - '/includes/include.drupalci.workflows.yml'
+workflow:
+  rules:
+  # These 3 rules from https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml
+    # Run on merge requests
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    # Run when called from an upstream pipeline https://docs.gitlab.com/ee/ci/pipelines/downstream_pipelines.html?tab=Multi-project+pipeline#use-rules-to-control-downstream-pipeline-jobs
+    - if: $CI_PIPELINE_SOURCE == 'pipeline'
+    # Run when called from a parent pipeline (e.g. updated dependencies job)
+    - if: $CI_PIPELINE_SOURCE == 'parent_pipeline'
+    # Run on commits.
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    # The last rule above blocks manual and scheduled pipelines on non-default branch. The rule below allows them:
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    # Run if triggered from Web using 'Run Pipelines'
+    - if: $CI_PIPELINE_SOURCE == "web"
+     # Run if triggered from WebIDE
+    - if: $CI_PIPELINE_SOURCE == "webide"
 
 ################
 # Variables
@@ -42,13 +56,13 @@ include:
 ################
 
 variables:
-  COMPOSER: composer.json
+  _CONFIG_DOCKERHUB_ROOT: "drupalci"
   # Let composer know what self.version means.
   COMPOSER_ROOT_VERSION: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}-dev"
   CONCURRENCY: 24
-  GIT_DEPTH: "3"
+  GIT_DEPTH: "50"
   PARENT_PIPELINE_ID: $CI_PIPELINE_ID
-
+  _TARGET_PHP: "8.3"
 
 #############
 # Stages    #
@@ -59,12 +73,11 @@ stages:
   - 🗜️ Test
 
 #############
-# Templates #
+# Defaults  #
 #############
 
-.default-job-settings: &default-job-settings-lint
+default:
   interruptible: true
-  allow_failure: false
   retry:
     max: 2
     when:
@@ -73,15 +86,12 @@ stages:
       - stuck_or_timeout_failure
       - runner_system_failure
       - scheduler_failure
-  variables:
-    _TARGET_PHP: "8.2"
-    _TARGET_DB: "sqlite-3"
   image:
     name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+#############
+# Templates #
+#############
 
 .with-composer: &with-composer
   needs:
@@ -91,14 +101,9 @@ stages:
   needs:
     - '📦️ Yarn'
 
-.junit-artifacts: &junit-artifacts
-  artifacts:
-    expose_as: junit
-    expire_in: 6 mos
-    paths:
-      - junit.xml
-    reports:
-      junit: junit.xml
+.default-job-settings-lint: &default-job-settings-lint
+  rules:
+    - if: $PERFORMANCE_TEST != "1"
 
 
 ################
@@ -122,90 +127,148 @@ stages:
 .run-on-commit: &run-on-commit
   rules:
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: manual
       allow_failure: true
 
 .run-daily: &run-daily
   rules:
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project" && $DAILY_TEST == "1"
+      allow_failure: true
+
+.run-on-mr: &run-on-mr
+  rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: manual
       allow_failure: true
 
 # Default configuration.
-'PHP 8.2 MySQL 8':
+'DEFAULT: PHP 8.3 MySQL 8':
   <<: *default-stage
   variables:
-    _TARGET_PHP: "8.2"
+    _TARGET_PHP: "8.3"
     _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"
+      allow_failure: true
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project" && $DAILY_TEST == "1"
+      allow_failure: true
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
+    - if: $PERFORMANCE_TEST == "1"
 
-# Run on commit, or manually.
-'PHP 8.1 MySQL 5.7':
-  <<: [ *default-stage, *run-on-commit ]
+# Re-run the pipeline, but with Composer updates.
+'DEFAULT: Updated dependencies (PHP 8.3 MySQL 8)':
+  <<: *default-stage
+  # Run daily and allow manual runs on MRs.
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_ROOT_NAMESPACE == "project" && $DAILY_TEST == "1"
+      allow_failure: true
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+      allow_failure: true
   variables:
-    _TARGET_PHP: "8.1"
-    _TARGET_DB: "mysql-5.7"
+    COMPOSER_UPDATE: "1"
+  trigger:
+    include: .gitlab-ci.yml
 
-'PHP 8.2 PostgreSQL 14.1':
-  <<: [ *default-stage, *run-daily ]
+# Special job for MRs for test-only checks.
+'DEFAULT: Test-only (PHP 8.3 MySQL 8)':
+  <<: [ *default-stage, *with-composer ]
+  when: manual
+  allow_failure: true
   variables:
-    _TARGET_PHP: "8.2"
-    _TARGET_DB: "pgsql-14.1"
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "mysql-8"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  trigger:
+    # Rely on the status of the child pipeline.
+    strategy: depend
+    include:
+      - local: .gitlab-ci/pipeline-test-only.yml
 
-'PHP 8.2 PostgreSQL 15':
-  <<: [ *default-stage, *run-daily ]
+# Main listing of jobs.
+# All of these are available on Merge Requests and also work as base jobs for
+# on-commit and daily jobs to extend from.
+'PHP 8.3 MySQL 5.7':
+  <<: [ *default-stage, *run-on-mr ]
   variables:
-    _TARGET_PHP: "8.2"
-    _TARGET_DB: "pgsql-15"
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "mysql-5.7"
 
-'PHP 8.2 PostgreSQL 16':
-  <<: [ *default-stage, *run-on-commit ]
+'PHP 8.3 MariaDB 10.3.22':
+  <<: [ *default-stage, *run-on-mr ]
   variables:
-    _TARGET_PHP: "8.2"
-    _TARGET_DB: "pgsql-16"
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "mariadb-10.3.22"
 
-'PHP 8.2 SQLite 3':
-  <<: [ *default-stage, *run-on-commit ]
+'PHP 8.3 PostgreSQL 14.1':
+  <<: [ *default-stage, *run-on-mr ]
   variables:
-    _TARGET_PHP: "8.2"
-    _TARGET_DB: "sqlite-3"
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "pgsql-14.1"
 
-# Run daily, or manually.
-# 'PHP 8.1 MariaDB 10.3.22':
-#   <<: [ *default-stage, *run-daily ]
-#   variables:
-#     _TARGET_PHP: "8.1"
-#     _TARGET_DB: "mariadb-10.3.22"
-
-# 'PHP 8.1 MySQL 5.7 with updated deps':
-#   <<: [ *default-stage, *run-daily ]
-#   variables:
-#     _TARGET_PHP: "8.1"
-#     _TARGET_DB: "mysql-5.7"
-
-'PHP 8.1 PostgreSQL 14.1':
-  <<: [ *default-stage, *run-daily ]
+'PHP 8.3 PostgreSQL 15':
+  <<: [ *default-stage, *run-on-mr ]
   variables:
-    _TARGET_PHP: "8.1"
-    _TARGET_DB: "pgsql-14.1"
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "pgsql-15"
+
+'PHP 8.3 PostgreSQL 16':
+  <<: [ *default-stage, *run-on-mr ]
+  variables:
+    _TARGET_PHP: "8.3"
+    _TARGET_DB: "pgsql-16"
 
-'PHP 8.1 SQLite 3':
-  <<: [ *default-stage, *run-daily ]
+'PHP 8.3 SQLite 3':
+  <<: [ *default-stage, *run-on-mr ]
   variables:
-    _TARGET_PHP: "8.1"
+    _TARGET_PHP: "8.3"
     _TARGET_DB: "sqlite-3"
 
+# Jobs running on commits.
+# The value set in the "needs" property will determine the order in the sequence.
+'[Commit] PHP 8.3 MySQL 5.7':
+  extends: 'PHP 8.3 MySQL 5.7'
+  needs: [ 'DEFAULT: PHP 8.3 MySQL 8' ]
+  <<: [ *run-on-commit ]
+
+'[Commit] PHP 8.3 PostgreSQL 16':
+  extends: 'PHP 8.3 PostgreSQL 16'
+  needs: [ '[Commit] PHP 8.3 MySQL 5.7' ]
+  <<: [ *run-on-commit ]
+
+'[Commit] PHP 8.3 SQLite 3':
+  extends: 'PHP 8.3 SQLite 3'
+  needs: [ '[Commit] PHP 8.3 PostgreSQL 16' ]
+  <<: [ *run-on-commit ]
+
+# Jobs running daily.
+# 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' ]
+  <<: [ *run-daily ]
+
+'[Daily] PHP 8.3 SQLite 3':
+  extends: 'PHP 8.3 SQLite 3'
+  needs: [ '[Daily] PHP 8.3 PostgreSQL 16' ]
+  <<: [ *run-daily ]
+
+'[Daily] PHP 8.3 MariaDB 10.3.22':
+  extends: 'PHP 8.3 MariaDB 10.3.22'
+  needs: [ '[Daily] PHP 8.3 SQLite 3' ]
+  <<: [ *run-daily ]
 
 ################
 # Build Jobs for linting
 ################
 
 '📦️ Composer':
-  <<: *default-job-settings-lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "1"
   stage: 🏗️ Build
   cache:
     key:
@@ -222,9 +285,14 @@ stages:
   script:
       - composer validate
       - composer install
+      - if [ -n "$COMPOSER_UPDATE" ]; then
+          composer update;
+          composer outdated;
+        fi
 
 '📦️ Yarn':
-  <<: *default-job-settings-lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
   stage: 🏗️ Build
   cache:
     key:
@@ -239,60 +307,175 @@ stages:
     paths:
       - core/node_modules/
   script:
-    - yarn --cwd ./core install
+    - cd core
+    - corepack enable
+    - yarn install
 
 ################
 # Lint Jobs
 ################
 
 '🧹 PHP Static Analysis (phpstan)':
-  <<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ]
+  <<: [ *with-composer, *default-job-settings-lint ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "16"
   script:
-    - php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json
+    - 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 analyze --configuration=./core/phpstan.neon.dist --error-format=gitlab > phpstan-quality-report.json || EXIT_CODE=$?
+    - php vendor/bin/phpstan analyze --configuration=./core/phpstan.neon.dist --no-progress --error-format=junit > 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
+        exit $EXIT_CODE
+      fi
+
   artifacts:
     reports:
       codequality: phpstan-quality-report.json
+      junit: phpstan-junit.xml
+    # Only store the baseline if the job fails.
+    when: on_failure
+    paths:
+      - core/.phpstan-baseline.php
 
 '🧹 PHP Coding standards (PHPCS)':
-  <<: [ *with-composer, *junit-artifacts, *default-job-settings-lint ]
+  <<: [ *with-composer, *default-job-settings-lint ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "16"
   script:
+    - vendor/bin/phpcs --version
     - composer phpcs -- --report-full --report-summary --report-\\Micheh\\PhpCodeSniffer\\Report\\Gitlab=phpcs-quality-report.json
   artifacts:
     reports:
       codequality: phpcs-quality-report.json
 
 '🧹 JavaScript linting (eslint)':
-  <<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ]
+  <<: [ *with-yarn ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+  # Run on push, or on MRs if CSS files have changed, or manually.
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - core/package.json
+        - core/yarn.lock
+        - "**/*.js"
+        - "**/*.yml"
+    - when: manual
+      allow_failure: true
   script:
-    - yarn --cwd=./core run -s lint:core-js-passing --format gitlab
+    - cd core
+    - corepack enable
+    - yarn run check:ckeditor5
+    - yarn run lint:core-js-passing --format gitlab
   artifacts:
     reports:
       codequality: eslint-quality-report.json
 
 '🧹 CSS linting (stylelint)':
-  <<: [ *with-yarn, *junit-artifacts, *default-job-settings-lint ]
+  <<: [ *with-yarn ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+  # Run on push, or on MRs if CSS files have changed, or manually.
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_ROOT_NAMESPACE == "project"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - core/package.json
+        - core/yarn.lock
+        - "**/*.css"
+    - when: manual
+      allow_failure: true
   script:
-    - yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
+    - corepack enable
+    - cd core
+    - yarn run build:css --check
+    - yarn run lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
   artifacts:
     reports:
       codequality: stylelint-quality-report.json
 
-'🧹 Compilation check':
+'📔 Spell-checking':
   <<: [ *with-yarn, *default-job-settings-lint ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
   script:
-    - yarn run --cwd=./core build:css --check
-    - cd core && yarn run -s check:ckeditor5
-
-'📔 Spell-checking':
-  <<: [ *with-yarn, *default-job-settings-lint ]
+    - if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
+        echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_TARGET_BRANCH_SHA is ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA}";
+      else
+        echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_DIFF_BASE_SHA is ${CI_MERGE_REQUEST_DIFF_BASE_SHA}";
+      fi;
+    - cd core
+    - corepack enable
+    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn run spellcheck:core --no-must-find-files --file-list stdin
+
+'📔 Validatable config':
+  <<: [ *default-job-settings-lint ]
   stage: 🪄 Lint
+  variables:
+    KUBERNETES_CPU_REQUEST: "2"
+  # Run on MRs if config schema files have changed, or manually.
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - "**/config/schema/*.schema.yml"
+        # Modules may alter config schema using hook_config_schema_info_alter().
+        - "**/*.module"
+    - when: manual
+      allow_failure: true
+  artifacts:
+    expire_in: 1 week
+    expose_as: 'validatable-config'
+    paths:
+      - HEAD.json
+      - MR.json
+  # This job must pass, but must also not disrupt Drupal core's CI if dependencies are not core-compatible.
+  allow_failure:
+    exit_codes:
+      # `composer require …` fails (implies no version available compatible with Drupal core)
+      - 100
+      # `drush pm:install config_inspector …` fails (implies failure during module installation)
+      - 101
+      # Temporarily allow this to fail as there's are bugs with adding/removing/modifying config schemas.
+      - 1
   script:
-    - export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}
-    - git fetch -vn --depth=$GIT_DEPTH "${CI_MERGE_REQUEST_PROJECT_URL:-origin}" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH"
-    - export MODIFIED=`git diff --name-only refs/heads/$TARGET_BRANCH|while read r;do echo "$CI_PROJECT_DIR/$r";done|tr "\n" " "`
-    - echo $MODIFIED | tr ' ' '\n' | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin
+    # Revert back to the tip of the branch this MR started from.
+    - git checkout -f $CI_MERGE_REQUEST_DIFF_BASE_SHA
+    # Composer-install Drush & the Config Inspector module.
+    - composer require drush/drush drupal/config_inspector || exit 100
+    # Install Drupal's Standard install profile + all core modules + the config inspector module.
+    - php core/scripts/drupal install standard
+    - ls core/modules | grep -v help_topics | xargs vendor/bin/drush pm:install --yes
+    - vendor/bin/drush pm:install config_inspector --yes --quiet || exit 101
+    # Compute statistics for coverage of validatable config for HEAD.
+    - 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
+    - vendor/bin/drush cr --quiet
+    # Compute statistics for coverage of validatable config for MR.
+    - vendor/bin/drush config:inspect --statistics > MR.json
+    # Output diff, but never fail the job.
+    - diff -u HEAD.json MR.json || true
+    # Determine if this increased or decreased coverage. Fail the job if it is worse. All the
+    # percentages must be equal or higher, with the exception of `typesInUse`.
+    - |
+      php -r '
+         $head = json_decode(file_get_contents("HEAD.json"), TRUE)["assessment"];
+         $mr = json_decode(file_get_contents("MR.json"), TRUE)["assessment"];
+         unset($head["_description"], $head["typesInUse"], $mr["_description"], $mr["typesInUse"]);
+         $impact = array_map(fn (float $h, float $m) => $m-$h, $head, $mr);
+         exit((int) (min($impact) < 0));
+      '

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

+# cspell:ignore drupaltestbot drupaltestbotpw
+
+stages:
+  - 🗜️ Test
+
+variables:
+  FF_NETWORK_PER_BUILD: 1
+  SIMPLETEST_BASE_URL: http://localhost/subdirectory
+  DB_DRIVER: mysql
+  MYSQL_ROOT_PASSWORD: root
+  MYSQL_DATABASE: mysql
+  MYSQL_USER: drupaltestbot
+  MYSQL_PASSWORD: drupaltestbotpw
+  POSTGRES_DB: drupaltestbot
+  POSTGRES_USER: drupaltestbot
+  POSTGRES_PASSWORD: drupaltestbotpw
+  MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless"]}}, "http://localhost:9515"]'
+
+'🩹 Test-only changes':
+  stage: 🗜️ Test
+  interruptible: true
+  image:
+    name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "parent_pipeline" && $PERFORMANCE_TEST != "1"
+  needs:
+    - pipeline: $PARENT_PIPELINE_ID
+      job: '📦️ Composer'
+  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="
+  before_script:
+    - |
+      [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/$CI_PROJECT_DIR/sites/default/files/db.sqlite?module=sqlite
+      [[ $_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
+    - $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh
+  script:
+    - $CI_PROJECT_DIR/.gitlab-ci/scripts/test-only.sh
+  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
+      - ./sites/simpletest/browser_output

.gitlab-ci/pipeline.yml

@@ -7,10 +7,8 @@ stages:
 # Templates #
 #############
 
-.default-job-settings: &default-job-settings
-  stage: 🗜️ Test
+default:
   interruptible: true
-  allow_failure: false
   retry:
     max: 2
     when:
@@ -21,17 +19,30 @@ stages:
       - scheduler_failure
   image:
     name: $_CONFIG_DOCKERHUB_ROOT/php-$_TARGET_PHP-apache:production
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
-
-.junit-artifacts: &junit-artifacts
+  before_script:
+    - |
+      [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/$CI_PROJECT_DIR/sites/default/files/db.sqlite?module=sqlite
+      [[ $_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
+    - echo "SIMPLETEST_DB = $SIMPLETEST_DB"
+    - $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh
+  after_script:
+    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
   artifacts:
-    expose_as: junit
+    when: always
     expire_in: 6 mos
-    paths:
-      - junit.xml
     reports:
-      junit: junit.xml
+      junit: ./sites/default/files/simpletest/phpunit-*.xml
+    paths:
+      - ./sites/default/files/simpletest/phpunit-*.xml
+      - ./sites/simpletest/browser_output
+      - '*.log'
+
+.default-job-settings: &default-job-settings
+  stage: 🗜️ Test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "parent_pipeline" && $PERFORMANCE_TEST != "1"
 
 .with-composer: &with-composer
   needs:
@@ -45,7 +56,7 @@ stages:
     - pipeline: $PARENT_PIPELINE_ID
       job: '📦️ Yarn'
 
-.test-variables: &test-variables
+variables:
   FF_NETWORK_PER_BUILD: 1
   SIMPLETEST_BASE_URL: http://localhost/subdirectory
   DB_DRIVER: mysql
@@ -56,7 +67,7 @@ stages:
   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":{"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
 
@@ -70,39 +81,28 @@ stages:
   entrypoint:
     - chromedriver
     - "--no-sandbox"
-    - "--log-path=/tmp/chromedriver.log"
-    - "--verbose"
+    - "--log-path=/builds/chromedriver.log"
     - "--whitelisted-ips="
-
-.phpunit-artifacts: &phpunit-artifacts
-  artifacts:
-    when: always
-    expire_in: 6 mos
-    reports:
-      junit: ./sites/default/files/simpletest/phpunit-*.xml
-    paths:
-      - ./sites/default/files/simpletest/phpunit-*.xml
-      - ./sites/simpletest/browser_output
-
-.setup-webroot: &setup-webserver
-  before_script:
-    - ln -s $CI_PROJECT_DIR /var/www/html/subdirectory
-    - sudo service apache2 start
+    - "--allowed-origins=*"
 
 .run-tests: &run-tests
   script:
-    # Determine DB driver.
-    - |
-      [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/$CI_PROJECT_DIR/sites/default/files/db.sqlite?module=sqlite
-      [[ $_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
-    - 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
     # 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
 
+.run-repeat-class-test: &run-repeat-class-test
+  script:
+    - echo "ℹ️ Running class ${REPEAT_TEST_CLASS}"
+    - |
+      if [[ $REPEAT_TEST_CLASS == "Drupal\Tests\Change\Me" ]]; then
+        echo '❗ You need to change the REPEAT_TEST_CLASS variable to an existing class before running the job.'
+        echo '   You just need to click on the job that you want to run (do not press the play button straight away) and then set the following:'
+        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
+      fi
+
 ################
 # Jobs
 #
@@ -113,117 +113,75 @@ stages:
 # Documentation: https://docs.gitlab.com/ee/ci/jobs/
 ################
 
-'🌐️️ PHPUnit Functional':
-  <<: [ *with-composer, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
-  parallel: 7
-  variables:
-    <<: *test-variables
-    TESTSUITE: PHPUnit-Functional
-    CONCURRENCY: "$CONCURRENCY"
-  services:
-    - <<: *with-database
-
 '🩹 Test-only changes':
-  <<: [ *with-composer, *phpunit-artifacts, *setup-webserver, *default-job-settings ]
+  <<: [ *with-composer, *default-job-settings ]
   when: manual
-  interruptible: true
   allow_failure: true
-  variables:
-    <<: *test-variables
   services:
     - <<: *with-database
     - <<: *with-chrome
   script:
-    #  Determine DB driver.
-    - |
-      [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/subdirectory/sites/default/files/db.sqlite?module=sqlite
-      [[ $_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
-    - 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
-    - export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}
-    - git fetch -vn --depth=3 "$CI_MERGE_REQUEST_PROJECT_URL" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH"
-    - |
-      echo "ℹ️ Changes from ${TARGET_BRANCH}"
-      git diff refs/heads/${TARGET_BRANCH} --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 refs/heads/${TARGET_BRANCH} --diff-filter=DM --name-only|grep -Ev "Test.php$"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
-        git diff refs/heads/${TARGET_BRANCH} --diff-filter=DM --name-only|grep -Ev "Test.php$"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh|while read file;do
-          echo "↩️ Reverting $file";
-          git checkout refs/heads/${TARGET_BRANCH} -- $file;
-        done
-      fi
-      if [[ $(git diff refs/heads/${TARGET_BRANCH} --diff-filter=A --name-only|grep -Ev "Test.php$"|grep -v .gitlab-ci|grep -v scripts/run-tests.sh) ]]; then
-        git diff refs/heads/${TARGET_BRANCH} --diff-filter=A --name-only|grep -Ev "Test.php$"|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 refs/heads/${TARGET_BRANCH} --name-only|grep -E "Test.php$") ]]; then
-        for test in `git diff refs/heads/${TARGET_BRANCH} --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;
-        done;
-      fi
-
-'⚙️️ PHPUnit Kernel':
-  <<: [*with-composer, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
-  parallel: 2
-  variables:
-    <<: *test-variables
-    TESTSUITE: PHPUnit-Kernel
-    CONCURRENCY: "$CONCURRENCY"
-  services:
-    - <<: *with-database
+    - $CI_PROJECT_DIR/.gitlab-ci/scripts/test-only.sh
 
 '🖱️️️ PHPUnit Functional Javascript':
-  <<: [ *with-composer, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *with-composer, *run-tests, *default-job-settings ]
   parallel: 2
   variables:
-    <<: *test-variables
     TESTSUITE: PHPUnit-FunctionalJavascript
     CONCURRENCY: 15
+    KUBERNETES_CPU_REQUEST: "24"
   services:
     - <<: *with-database
     - <<: *with-chrome
+  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
+  variables:
+    TESTSUITE: PHPUnit-Functional
+    KUBERNETES_CPU_REQUEST: "24"
+  services:
+    - <<: *with-database
+
+'⚙️️ PHPUnit Kernel':
+  <<: [ *with-composer, *run-tests, *default-job-settings ]
+  parallel: 3
+  variables:
+    TESTSUITE: PHPUnit-Kernel
+    KUBERNETES_CPU_REQUEST: "16"
+  services:
+    - <<: *with-database
 
 '👷️️️ PHPUnit Build':
-  <<: [ *with-composer, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *with-composer, *run-tests, *default-job-settings ]
   variables:
-    <<: *test-variables
     TESTSUITE: PHPUnit-Build
-    CONCURRENCY: "$CONCURRENCY"
+    KUBERNETES_CPU_REQUEST: "2"
   services:
     - <<: *with-database
 
 '⚡️ PHPUnit Unit':
-  <<: [ *with-composer, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]
+  <<: [ *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:
-    <<: *test-variables
     TESTSUITE: PHPUnit-Unit
-    CONCURRENCY: "$CONCURRENCY"
+    KUBERNETES_CPU_REQUEST: "16"
 
 '🦉️️️ Nightwatch':
-  <<: [ *with-composer-and-yarn, *setup-webserver, *default-job-settings ]
+  <<: [ *with-composer-and-yarn, *default-job-settings ]
   variables:
-    <<: *test-variables
+    KUBERNETES_CPU_REQUEST: "24"
   services:
     - <<: *with-database
     - <<: *with-chrome
   script:
-    # Determine DB driver.
-    - |
-      [[ $_TARGET_DB == sqlite* ]] && export DRUPAL_TEST_DB_URL=sqlite://localhost/$CI_PROJECT_DIR/sites/default/files/db.sqlite?module=sqlite
-      [[ $_TARGET_DB == mysql* ]] && export DRUPAL_TEST_DB_URL=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
-      [[ $_TARGET_DB == mariadb* ]] && export DRUPAL_TEST_DB_URL=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
-      [[ $_TARGET_DB == pgsql* ]] && export DRUPAL_TEST_DB_URL=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql
+    - export DRUPAL_TEST_DB_URL=$SIMPLETEST_DB
     - cp ./core/.env.example ./core/.env
     # dotenv-safe/config does not support environment variables
     # @see https://github.com/rolodato/dotenv-safe/issues/126
@@ -232,17 +190,55 @@ stages:
     - 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_CHROME_ARGS='--disable-dev-shm-usage --disable-gpu --headless'" >> ./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_NIGHTWATCH_OUTPUT='"nightwatch_output"'" >> ./core/.env
-    - cat ./core/.env
-    - mkdir -p ./sites/simpletest ./sites/default/files /var/www/.cache/yarn /var/www/.yarn ./nightwatch_output
-    - chown -R www-data:www-data ./sites/simpletest ./sites/default/files /var/www/.cache/yarn /var/www/.yarn ./nightwatch_output ./core/.env
-    - sudo BABEL_DISABLE_CACHE=1 -u www-data yarn --cwd ./core test:nightwatch --workers=4
+    - echo "DRUPAL_NIGHTWATCH_OUTPUT='"../nightwatch_output"'" >> ./core/.env
+    - echo "COLUMNS=1000" >> ./core/.env
+    - chown -R www-data:www-data ./sites /var/www
+    - cd core
+    - corepack enable
+    - sudo -u www-data yarn run test:nightwatch --workers=4
+  after_script:
+    - cp /builds/chromedriver.log ./
   artifacts:
     when: always
     expire_in: 6 mos
     reports:
-      junit: ./nightwatch_output/*.xml
+      junit: ./nightwatch_output/**/*.xml
     paths:
       - ./nightwatch_output
+      - '*.log'
+
+'🔁 Repeat Class Test':
+  <<: [ *with-composer, *run-repeat-class-test, *default-job-settings ]
+  when: manual
+  allow_failure: true
+  variables:
+    REPEAT_TEST_CLASS: 'Drupal\Tests\Change\Me'
+  services:
+    - <<: *with-database
+
+'🚲 Performance tests':
+  <<: [ *with-composer, *default-job-settings ]
+  rules:
+    - if: $PERFORMANCE_TEST == "1"
+  variables:
+    KUBERNETES_CPU_REQUEST: "24"
+    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:
+    - <<: *with-database
+    - <<: *with-chrome
+  script:
+    #  Determine DB driver.
+    - |
+      [[ $_TARGET_DB == sqlite* ]] && export SIMPLETEST_DB=sqlite://localhost/subdirectory/sites/default/files/db.sqlite?module=sqlite
+      [[ $_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
+    - 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

.gitlab-ci/scripts/server-setup.sh

+#!/bin/bash
+
+ln -s $CI_PROJECT_DIR /var/www/html/subdirectory
+sudo service apache2 start
+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

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

+#!/bin/bash
+
+BASELINE=${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA}
+
+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 ${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 ${BASELINE} -- $file;
+done
+fi
+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 ${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;
+done;
+fi

autoload.php

@@ -8,7 +8,6 @@
  * @see index.php
  * @see core/install.php
  * @see core/rebuild.php
- * @see core/modules/statistics/statistics.php
  */
 
 return require __DIR__ . '/vendor/autoload.php';

composer.json

@@ -15,15 +15,15 @@
         "drupal/core-vendor-hardening": "self.version"
     },
     "require-dev": {
-        "behat/mink": "^1.10",
-        "behat/mink-browserkit-driver": "^2.1",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink": "^1.11",
+        "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.6.4",
+        "composer/composer": "^2.7",
         "drupal/coder": "^8.3.10",
-        "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2",
+        "lullabot/mink-selenium2-driver": "^1.7",
+        "lullabot/php-webdriver": "^2.0.3",
+        "mglaman/phpstan-drupal": "^1.2.10",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
@@ -31,25 +31,26 @@
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.38",
-        "phpstan/phpstan-phpunit": "^1.3.11",
-        "phpunit/phpunit": "^9.5",
-        "symfony/browser-kit": "^6.3",
-        "symfony/css-selector": "^6.3",
-        "symfony/dom-crawler": "^6.3",
-        "symfony/error-handler": "^6.3",
-        "symfony/filesystem": "^6.3",
-        "symfony/finder": "^6.3",
-        "symfony/lock": "^6.3",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/var-dumper": "^6.3"
+        "phpstan/phpstan": "^1.10.62",
+        "phpstan/phpstan-phpunit": "^1.3.16",
+        "phpunit/phpunit": "^9.6.13",
+        "symfony/browser-kit": "^7.0",
+        "symfony/config": "^7.0",
+        "symfony/css-selector": "^7.0",
+        "symfony/dom-crawler": "^7.0",
+        "symfony/error-handler": "^7.0",
+        "symfony/lock": "^7.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/var-dumper": "^7.0"
     },
     "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,
@@ -57,7 +58,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.1.0"
+            "php": "8.3.0"
         },
         "allow-plugins": {
             "composer/installers": true,
@@ -117,8 +118,8 @@
             "Drupal\\Composer\\Composer::generateMetapackages",
             "Drupal\\Composer\\Composer::generateComponentPackages"
         ],
-        "phpcs": "phpcs --standard=core/phpcs.xml.dist --parallel=$(nproc) --",
-        "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --parallel=$(nproc) --"
+        "phpcs": "phpcs --standard=core/phpcs.xml.dist --parallel=\"$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)\" --",
+        "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --parallel=\"$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)\" --"
     },
     "repositories": [
         {

composer/Metapackage/CoreRecommended/composer.json

@@ -8,57 +8,59 @@
     },
     "require": {
         "drupal/core": "11.x-dev",
-        "asm89/stack-cors": "~v2.1.1",
-        "composer/semver": "~3.3.2",
-        "doctrine/annotations": "~1.14.3",
-        "doctrine/deprecations": "~v1.1.1",
+        "asm89/stack-cors": "~v2.2.0",
+        "composer/semver": "~3.4.0",
+        "doctrine/annotations": "~2.0.1",
+        "doctrine/deprecations": "~1.1.2",
         "doctrine/lexer": "~2.1.0",
-        "egulias/email-validator": "~4.0.1",
-        "guzzlehttp/guzzle": "~7.7.0",
-        "guzzlehttp/promises": "~2.0.0",
-        "guzzlehttp/psr7": "~2.5.0",
-        "masterminds/html5": "~2.8.0",
+        "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",
         "pear/console_getopt": "~v1.4.3",
-        "pear/pear-core-minimal": "~v1.10.13",
+        "pear/pear-core-minimal": "~v1.10.14",
         "pear/pear_exception": "~v1.0.2",
+        "php-tuf/composer-stager": "~v2.0.0-beta5",
         "psr/cache": "~3.0.0",
         "psr/container": "~2.0.2",
         "psr/event-dispatcher": "~1.0.0",
-        "psr/http-client": "~1.0.2",
+        "psr/http-client": "~1.0.3",
         "psr/http-factory": "~1.0.2",
         "psr/log": "~3.0.0",
         "ralouphie/getallheaders": "~3.0.3",
         "sebastian/diff": "~4.0.5",
-        "symfony/console": "~v6.3.0",
-        "symfony/dependency-injection": "~v6.3.0",
-        "symfony/deprecation-contracts": "~v3.3.0",
-        "symfony/error-handler": "~v6.3.0",
-        "symfony/event-dispatcher": "~v6.3.0",
-        "symfony/event-dispatcher-contracts": "~v3.3.0",
-        "symfony/http-foundation": "~v6.3.0",
-        "symfony/http-kernel": "~v6.3.0",
-        "symfony/mailer": "~v6.3.5",
-        "symfony/mime": "~v6.3.0",
-        "symfony/polyfill-ctype": "~v1.27.0",
-        "symfony/polyfill-iconv": "~v1.27.0",
-        "symfony/polyfill-intl-grapheme": "~v1.27.0",
-        "symfony/polyfill-intl-idn": "~v1.27.0",
-        "symfony/polyfill-intl-normalizer": "~v1.27.0",
-        "symfony/polyfill-mbstring": "~v1.27.0",
-        "symfony/polyfill-php83": "~v1.27.0",
-        "symfony/process": "~v6.3.0",
-        "symfony/psr-http-message-bridge": "~v2.2.0",
-        "symfony/routing": "~v6.3.0",
-        "symfony/serializer": "~v6.3.0",
-        "symfony/service-contracts": "~v3.3.0",
-        "symfony/string": "~v6.3.0",
-        "symfony/translation-contracts": "~v3.3.0",
-        "symfony/validator": "~v6.3.0",
-        "symfony/var-dumper": "~v6.3.0",
-        "symfony/var-exporter": "~v6.3.0",
-        "symfony/yaml": "~v6.3.0",
-        "twig/twig": "~v3.6.0"
+        "symfony/console": "~v7.0.6",
+        "symfony/dependency-injection": "~v7.0.4",
+        "symfony/deprecation-contracts": "~v3.4.0",
+        "symfony/error-handler": "~v7.0.4",
+        "symfony/event-dispatcher": "~v7.0.3",
+        "symfony/event-dispatcher-contracts": "~v3.4.0",
+        "symfony/filesystem": "~v7.0.3",
+        "symfony/finder": "~v7.0.0",
+        "symfony/http-foundation": "~v7.0.4",
+        "symfony/http-kernel": "~v7.0.5",
+        "symfony/mailer": "~v7.0.4",
+        "symfony/mime": "~v7.0.3",
+        "symfony/polyfill-ctype": "~v1.29.0",
+        "symfony/polyfill-iconv": "~v1.29.0",
+        "symfony/polyfill-intl-grapheme": "~v1.29.0",
+        "symfony/polyfill-intl-idn": "~v1.29.0",
+        "symfony/polyfill-intl-normalizer": "~v1.29.0",
+        "symfony/polyfill-mbstring": "~v1.29.0",
+        "symfony/process": "~v7.0.4",
+        "symfony/psr-http-message-bridge": "~v7.0.3",
+        "symfony/routing": "~v7.0.5",
+        "symfony/serializer": "~v7.0.4",
+        "symfony/service-contracts": "~v3.4.1",
+        "symfony/string": "~v7.0.4",
+        "symfony/translation-contracts": "~v3.4.1",
+        "symfony/validator": "~v7.0.5",
+        "symfony/var-dumper": "~v7.0.4",
+        "symfony/var-exporter": "~v7.0.4",
+        "symfony/yaml": "~v7.0.3",
+        "twig/twig": "~v3.8.0"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -7,15 +7,15 @@
         "webflo/drupal-core-require-dev": "*"
     },
     "require": {
-        "behat/mink": "^1.10",
-        "behat/mink-browserkit-driver": "^2.1",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink": "^1.11",
+        "behat/mink-browserkit-driver": "^2.2",
         "colinodell/psr-testlogger": "^1.2",
-        "composer/composer": "^2.6.4",
+        "composer/composer": "^2.7",
         "drupal/coder": "^8.3.10",
-        "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.2",
+        "lullabot/mink-selenium2-driver": "^1.7",
+        "lullabot/php-webdriver": "^2.0.3",
+        "mglaman/phpstan-drupal": "^1.2.10",
         "micheh/phpcs-gitlab": "^1.1",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "^1",
@@ -23,17 +23,16 @@
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.38",
-        "phpstan/phpstan-phpunit": "^1.3.11",
-        "phpunit/phpunit": "^9.5",
-        "symfony/browser-kit": "^6.3",
-        "symfony/css-selector": "^6.3",
-        "symfony/dom-crawler": "^6.3",
-        "symfony/error-handler": "^6.3",
-        "symfony/filesystem": "^6.3",
-        "symfony/finder": "^6.3",
-        "symfony/lock": "^6.3",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/var-dumper": "^6.3"
+        "phpstan/phpstan": "^1.10.62",
+        "phpstan/phpstan-phpunit": "^1.3.16",
+        "phpunit/phpunit": "^9.6.13",
+        "symfony/browser-kit": "^7.0",
+        "symfony/config": "^7.0",
+        "symfony/css-selector": "^7.0",
+        "symfony/dom-crawler": "^7.0",
+        "symfony/error-handler": "^7.0",
+        "symfony/lock": "^7.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/var-dumper": "^7.0"
     }
 }

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -8,57 +8,57 @@
     },
     "require": {
         "drupal/core": "11.x-dev",
-        "behat/mink": "v1.10.0",
-        "behat/mink-browserkit-driver": "v2.1.0",
-        "behat/mink-selenium2-driver": "v1.6.0",
-        "colinodell/psr-testlogger": "v1.2.0",
-        "composer/ca-bundle": "1.3.6",
-        "composer/class-map-generator": "1.0.0",
-        "composer/composer": "2.6.4",
+        "behat/mink": "v1.11.0",
+        "behat/mink-browserkit-driver": "v2.2.0",
+        "colinodell/psr-testlogger": "v1.3.0",
+        "composer/ca-bundle": "1.3.7",
+        "composer/class-map-generator": "1.1.0",
+        "composer/composer": "2.7.1",
         "composer/metadata-minifier": "1.0.0",
-        "composer/pcre": "3.1.0",
-        "composer/spdx-licenses": "1.5.7",
+        "composer/pcre": "3.1.1",
+        "composer/spdx-licenses": "1.5.8",
         "composer/xdebug-handler": "3.0.3",
         "dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
         "doctrine/instantiator": "2.0.0",
         "drupal/coder": "8.3.22",
-        "google/protobuf": "v3.23.3",
-        "instaclick/php-webdriver": "1.4.16",
-        "justinrainbow/json-schema": "5.2.12",
-        "mglaman/phpstan-drupal": "1.2.0",
+        "google/protobuf": "v3.25.1",
+        "justinrainbow/json-schema": "v5.2.13",
+        "lullabot/mink-selenium2-driver": "v1.7.2",
+        "lullabot/php-webdriver": "v2.0.3",
+        "mglaman/phpstan-drupal": "1.2.10",
         "micheh/phpcs-gitlab": "1.1.0",
         "mikey179/vfsstream": "v1.6.11",
         "myclabs/deep-copy": "1.11.1",
-        "nikic/php-parser": "v4.15.5",
+        "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.0",
-        "open-telemetry/sem-conv": "1.22.1",
+        "open-telemetry/sdk": "1.0.1",
+        "open-telemetry/sem-conv": "1.23.1",
         "phar-io/manifest": "2.0.3",
         "phar-io/version": "3.2.1",
-        "php-http/discovery": "1.18.1",
+        "php-http/discovery": "1.19.2",
         "php-http/guzzle7-adapter": "1.0.0",
         "php-http/httplug": "2.4.0",
-        "php-http/promise": "1.1.0",
+        "php-http/promise": "1.2.1",
         "phpdocumentor/reflection-common": "2.2.0",
         "phpdocumentor/reflection-docblock": "5.3.0",
-        "phpdocumentor/type-resolver": "1.7.2",
-        "phpspec/prophecy": "v1.17.0",
-        "phpspec/prophecy-phpunit": "v2.0.2",
+        "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.20.4",
-        "phpstan/phpstan": "1.10.38",
+        "phpstan/phpdoc-parser": "1.24.4",
+        "phpstan/phpstan": "1.10.66",
         "phpstan/phpstan-deprecation-rules": "1.1.4",
-        "phpstan/phpstan-phpunit": "1.3.13",
-        "phpunit/php-code-coverage": "9.2.26",
+        "phpstan/phpstan-phpunit": "1.3.16",
+        "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.8",
-        "react/promise": "v2.10.0",
+        "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",
@@ -66,7 +66,7 @@
         "sebastian/complexity": "2.0.2",
         "sebastian/environment": "5.1.5",
         "sebastian/exporter": "4.0.5",
-        "sebastian/global-state": "5.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",
@@ -76,19 +76,17 @@
         "sebastian/version": "3.0.2",
         "seld/jsonlint": "1.10.0",
         "seld/phar-utils": "1.2.1",
-        "seld/signal-handler": "2.0.1",
-        "sirbrillig/phpcs-variable-analysis": "v2.11.16",
-        "slevomat/coding-standard": "8.12.1",
-        "squizlabs/php_codesniffer": "3.7.2",
-        "symfony/browser-kit": "v6.3.0",
-        "symfony/css-selector": "v6.3.0",
-        "symfony/dom-crawler": "v6.3.0",
-        "symfony/filesystem": "v6.3.0",
-        "symfony/finder": "v6.3.0",
-        "symfony/lock": "v6.3.0",
-        "symfony/phpunit-bridge": "v6.3.0",
-        "symfony/polyfill-php82": "v1.27.0",
-        "theseer/tokenizer": "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": "v7.0.3",
+        "symfony/config": "v7.0.6",
+        "symfony/css-selector": "v7.0.3",
+        "symfony/dom-crawler": "v7.0.4",
+        "symfony/lock": "v7.0.3",
+        "symfony/phpunit-bridge": "v7.0.4",
+        "theseer/tokenizer": "1.2.2",
         "webflo/drupal-finder": "1.2.2",
         "webmozart/assert": "1.11.0"
     }

composer/Plugin/Scaffold/GenerateAutoloadReferenceFile.php

@@ -113,7 +113,6 @@ protected static function autoLoadContents($relative_autoload_path) {
  * @see index.php
  * @see core/install.php
  * @see core/rebuild.php
- * @see core/modules/statistics/statistics.php
  */
 
 return require __DIR__ . '/{$relative_autoload_path}';

composer/Plugin/Scaffold/Git.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Composer\Plugin\Scaffold;
 
+// cspell:ignore unmatch
+
 use Composer\IO\IOInterface;
 use Composer\Util\ProcessExecutor;
 

composer/Plugin/Scaffold/ManageGitIgnore.php

@@ -115,7 +115,7 @@ protected function addToGitIgnore($dir, array $entries) {
     // Appending to existing .gitignore files.
     if (file_exists($git_ignore_path)) {
       $contents = file_get_contents($git_ignore_path);
-      if (!empty($contents) && substr($contents, -1) != "\n") {
+      if (!empty($contents) && !str_ends_with($contents, "\n")) {
         $contents .= "\n";
       }
     }

composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php

@@ -115,8 +115,7 @@ protected function checkListHasItemWithContent(array $scaffold_files) {
   /**
    * {@inheritdoc}
    */
-  #[\ReturnTypeWillChange]
-  public function getIterator() {
+  public function getIterator(): \ArrayIterator {
     return new \ArrayIterator($this->scaffoldFilesByProject);
   }
 

composer/Plugin/Scaffold/README.md

 # Drupal Composer Scaffold
 
-This project provides a composer plugin for placing scaffold files (like
-`index.php`, `update.php`, …) from the `drupal/core` project into their desired
-location inside the web root. Only individual files may be scaffolded with this
-plugin.
+This project provides a composer plugin making the Drupal core Composer package
+work correctly in a Composer project.
+
+This takes care of:
+  - Placing scaffold files (like `index.php`, `update.php`, …) from the
+    `drupal/core` project into their desired location inside the web root. Only
+    individual files may be scaffolded with this plugin.
+  - Writing an autoload.php file to the web root, which includes the Composer
+    autoload.php file.
 
 The purpose of scaffolding files is to allow Drupal sites to be fully managed by
 Composer, and still allow individual asset files to be placed in arbitrary
@@ -14,7 +19,7 @@ possible; for example, a project layout very similar to the current
 [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-scaffold)
 template will also be provided. When one of these projects is used, the user
 should be able to use `composer require` and `composer update` on a Drupal site
-immediately after untarring the downloaded archive.
+immediately after extracting the downloaded archive.
 
 Note that the dependencies of a Drupal site are only able to scaffold files if
 explicitly granted that right in the top-level composer.json file. See

composer/Plugin/VendorHardening/Config.php

@@ -22,7 +22,6 @@ class Config {
   protected static $defaultConfig = [
     'behat/mink' => ['tests'],
     'behat/mink-browserkit-driver' => ['tests'],
-    'behat/mink-selenium2-driver' => ['tests'],
     'composer/composer' => ['bin'],
     'drupal/coder' => [
       'coder_sniffer/Drupal/Test',
@@ -32,8 +31,9 @@ class Config {
     'egulias/email-validator' => ['documentation', 'tests'],
     'guzzlehttp/promises' => ['tests'],
     'guzzlehttp/psr7' => ['tests'],
-    'instaclick/php-webdriver' => ['doc', 'test'],
     'justinrainbow/json-schema' => ['demo'],
+    'lullabot/mink-selenium2-driver' => ['tests'],
+    'lullabot/php-webdriver' => ['doc', 'test'],
     'masterminds/html5' => ['bin', 'test'],
     'mck89/peast' => ['doc'],
     'mikey179/vfsstream' => ['src/test'],

composer/Plugin/VendorHardening/VendorHardeningPlugin.php

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

composer/Template/README.txt

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