diff --git a/.travis.yml b/.travis.yml index 0e186dc8c7..97a0cc77a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,34 +58,8 @@ before_script: # Export Composer's global bin dir to PATH, but not on PHP 5.2: composer config --list --global export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }` -- | - # Install the specified version of PHPUnit depending on the PHP version: - if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then - case "$TRAVIS_PHP_VERSION" in - 7.4snapshot|7.3|7.2|7.1|nightly) - echo "Using PHPUnit 7.x" - travis_retry composer global require "phpunit/phpunit:^7" - ;; - 7.0) - echo "Using PHPUnit 6.x" - travis_retry composer global require "phpunit/phpunit:^6" - ;; - 5.6) - echo "Using PHPUnit 4.x" - travis_retry composer global require "phpunit/phpunit:^4" - ;; - *) - echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION" - exit 1 - ;; - esac - fi -- | - # We only need to run composer install on the code formatting job. - if [[ "$WP_TRAVISCI" == "travis:format" ]]; then - composer --version - travis_retry composer install - fi +- composer --version +- travis_retry composer install - npm --version - node --version - nvm install 10.13.0 diff --git a/Gruntfile.js b/Gruntfile.js index 2397b11fa4..ba57070a61 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -642,27 +642,27 @@ module.exports = function(grunt) { }, phpunit: { 'default': { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'phpunit.xml.dist'] }, ajax: { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'ajax'] }, multisite: { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'tests/phpunit/multisite.xml'] }, 'ms-files': { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'tests/phpunit/multisite.xml', '--group', 'ms-files'] }, 'external-http': { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'external-http'] }, 'restapi-jsclient': { - cmd: 'phpunit', + cmd: 'vendor/bin/phpunit', args: ['--verbose', '-c', 'phpunit.xml.dist', '--group', 'restapi-jsclient'] } }, diff --git a/composer.json b/composer.json index 34d13463bb..effa294bf2 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "~0.5.0", - "wp-coding-standards/wpcs": "~2.0.0" + "wp-coding-standards/wpcs": "~2.0.0", + "phpunit/phpunit": "^4.8 || ^6.5 || ^7.5" }, "scripts": { "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source", diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 308c686a47..0000000000 --- a/composer.lock +++ /dev/null @@ -1,180 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "c7426ffeca8db395605e43bccf174b02", - "packages": [], - "packages-dev": [ - { - "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.5.0", - "source": { - "type": "git", - "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "e749410375ff6fb7a040a68878c656c2e610b132" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132", - "reference": "e749410375ff6fb7a040a68878c656c2e610b132", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.3|^7", - "squizlabs/php_codesniffer": "^2|^3" - }, - "require-dev": { - "composer/composer": "*", - "phpcompatibility/php-compatibility": "^9.0", - "sensiolabs/security-checker": "^4.1.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" - }, - "autoload": { - "psr-4": { - "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Franck Nijhof", - "email": "franck.nijhof@dealerdirect.com", - "homepage": "http://www.frenck.nl", - "role": "Developer / IT Manager" - } - ], - "description": "PHP_CodeSniffer Standards Composer Installer Plugin", - "homepage": "http://www.dealerdirect.com", - "keywords": [ - "PHPCodeSniffer", - "PHP_CodeSniffer", - "code quality", - "codesniffer", - "composer", - "installer", - "phpcs", - "plugin", - "qa", - "quality", - "standard", - "standards", - "style guide", - "stylecheck", - "tests" - ], - "time": "2018-10-26T13:21:45+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "379deb987e26c7cd103a7b387aea178baec96e48" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48", - "reference": "379deb987e26c7cd103a7b387aea178baec96e48", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2018-12-19T23:57:18+00:00" - }, - { - "name": "wp-coding-standards/wpcs", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce", - "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.3.1" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", - "phpcompatibility/php-compatibility": "^9.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Contributors", - "homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors" - } - ], - "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", - "keywords": [ - "phpcs", - "standards", - "wordpress" - ], - "time": "2019-01-16T10:13:16+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [] -}