Commit 5b9badb7 authored by catch's avatar catch
Browse files

Issue #3497431 by mondrake, catch, larowlan, godotislate, fjgarlin: Deprecate... 

Issue #3497431 by mondrake, catch, larowlan, godotislate, fjgarlin: Deprecate TestDiscovery test file scanning, use PHPUnit API instead

(cherry picked from commit 6ab557df)
parent c22e4159

.gitlab-ci/pipeline.yml

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ variables: 
  script:

    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check

    # Need to pass this along directly.

    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --all --ci-parallel-node-index $CI_PARALLEL_NODE_INDEX --ci-parallel-node-total $CI_PARALLEL_NODE_TOTAL

    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --debug-discovery --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html --all --ci-parallel-node-index $CI_PARALLEL_NODE_INDEX --ci-parallel-node-total $CI_PARALLEL_NODE_TOTAL



.run-repeat-class-test: &run-repeat-class-test

  script:
@@ -234,7 +234,7 @@ variables: 
  script:

    - sudo -u www-data -E -H composer run-script drupal-phpunit-upgrade-check

    # Run a small subset of tests to prove non W3C testing still works.

    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html javascript

    - sudo -u www-data -E -H php ./core/scripts/run-tests.sh --debug-discovery --color --keep-results --types "$TESTSUITE" --concurrency "$CONCURRENCY" --repeat "1" --sqlite "./sites/default/files/tests.sqlite" --dburl $SIMPLETEST_DB --url $SIMPLETEST_BASE_URL --verbose --non-html javascript



  after_script:

    - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true

composer.lock

+299 −223

File changed.

Preview size limit exceeded, changes collapsed.

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        "psr/log": "~3.0.2",

        "ralouphie/getallheaders": "~3.0.3",

        "revolt/event-loop": "~v1.0.7",

        "sebastian/diff": "~5.1.1",

        "sebastian/diff": "~6.0.2",

        "symfony/console": "~v7.3.0",

        "symfony/dependency-injection": "~v7.3.0",

        "symfony/deprecation-contracts": "~v3.6.0",

composer/Metapackage/PinnedDevDependencies/composer.json

+21 −20
Original line number Diff line number Diff line
@@ -55,35 +55,36 @@ 
        "phpstan/phpstan": "2.1.17",

        "phpstan/phpstan-deprecation-rules": "2.0.3",

        "phpstan/phpstan-phpunit": "2.0.6",

        "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.46",

        "phpunit/php-code-coverage": "11.0.9",

        "phpunit/php-file-iterator": "5.1.0",

        "phpunit/php-invoker": "5.0.1",

        "phpunit/php-text-template": "4.0.1",

        "phpunit/php-timer": "7.0.1",

        "phpunit/phpunit": "11.5.22",

        "ramsey/collection": "2.1.1",

        "ramsey/uuid": "4.8.1",

        "react/promise": "v3.2.0",

        "sebastian/cli-parser": "2.0.1",

        "sebastian/code-unit": "2.0.0",

        "sebastian/code-unit-reverse-lookup": "3.0.0",

        "sebastian/comparator": "5.0.3",

        "sebastian/complexity": "3.2.0",

        "sebastian/environment": "6.1.0",

        "sebastian/exporter": "5.1.2",

        "sebastian/global-state": "6.0.2",

        "sebastian/lines-of-code": "2.0.2",

        "sebastian/object-enumerator": "5.0.0",

        "sebastian/object-reflector": "3.0.0",

        "sebastian/recursion-context": "5.0.0",

        "sebastian/type": "4.0.0",

        "sebastian/version": "4.0.1",

        "sebastian/cli-parser": "3.0.2",

        "sebastian/code-unit": "3.0.3",

        "sebastian/code-unit-reverse-lookup": "4.0.1",

        "sebastian/comparator": "6.3.1",

        "sebastian/complexity": "4.0.1",

        "sebastian/environment": "7.2.1",

        "sebastian/exporter": "6.3.0",

        "sebastian/global-state": "7.0.2",

        "sebastian/lines-of-code": "3.0.1",

        "sebastian/object-enumerator": "6.0.1",

        "sebastian/object-reflector": "4.0.1",

        "sebastian/recursion-context": "6.0.2",

        "sebastian/type": "5.1.2",

        "sebastian/version": "5.0.2",

        "seld/jsonlint": "1.11.0",

        "seld/phar-utils": "1.2.1",

        "seld/signal-handler": "2.0.2",

        "sirbrillig/phpcs-variable-analysis": "v2.12.0",

        "slevomat/coding-standard": "8.18.1",

        "squizlabs/php_codesniffer": "3.13.0",

        "staabm/side-effects-detector": "1.0.5",

        "symfony/browser-kit": "v7.3.0",

        "symfony/css-selector": "v7.3.0",

        "symfony/dom-crawler": "v7.3.0",

core/.cspell.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
      "**/.*.json",

      ".*ignore",

      "composer.lock",

      "composer/Metapackage/PinnedDevDependencies/composer.json",

      "../composer/Metapackage/PinnedDevDependencies/composer.json",

      "assets/vendor/**",

      "misc/jquery.form.js",

      "lib/Drupal/Component/Diff/**",