diff --git a/.travis.yml b/.travis.yml index e32a541bdb..1150e9aa13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,12 @@ jobs: script: # The PHPUnit 7.x phar is not compatible with PHP 8 and won't be updated, # as PHPUnit 7 is no longer supported, so run the Composer-installed PHPUnit instead. - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group ajax - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http - - docker-compose run --rm phpunit php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group restapi-jsclient + - npm run test:php-composer --verbose -c phpunit.xml.dist + - npm run test:php-composer --verbose -c phpunit.xml.dist --group ajax + - npm run test:php-composer --verbose -c tests/phpunit/multisite.xml + - npm run test:php-composer --verbose -c tests/phpunit/multisite.xml --group ms-files + - npm run test:php-composer --verbose -c phpunit.xml.dist --group external-http + - npm run test:php-composer --verbose -c phpunit.xml.dist --group restapi-jsclient # __fakegroup__ is excluded to force PHPUnit to ignore the settings in phpunit.xml.dist. # Xdebug supports PHP 8 only from version 3.0, which is not released yet. # Once Xdebug 3.0 is released and included in the Docker image, this should be uncommented again. diff --git a/package.json b/package.json index 3331a46259..2f0d95ebeb 100644 --- a/package.json +++ b/package.json @@ -167,6 +167,7 @@ "env:logs": "node ./tools/local-env/scripts/docker.js logs", "env:pull": "node ./tools/local-env/scripts/docker.js pull", "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit", + "test:php-composer": "node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit", "test:e2e": "node ./tests/e2e/run-tests.js" } }