diff --git a/.travis.yml b/.travis.yml index e32a541bdbee7..3197e049de12b 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-lock.json b/package-lock.json index 10848604f4e6f..7c386e98a56d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13264,12 +13264,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -20161,12 +20161,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "extract-zip": { @@ -24216,12 +24216,12 @@ } }, "tar-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz", - "integrity": "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz", + "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", "dev": true, "requires": { - "bl": "^4.0.1", + "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", diff --git a/package.json b/package.json index 3331a46259f96..2f0d95ebebeeb 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" } }