diff --git a/.travis.yml b/.travis.yml index 0f586fff70..049fb12bbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,8 @@ before_install: - echo "extension=zmq.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - yes | pecl install imagick-beta install: - - travis_retry composer require --dev phpunit/phpunit --sort-packages --optimize-autoloader --update-with-dependencies --prefer-source + - if [[ $TRAVIS_PHP_VERSION = 5.* ]];then travis_retry composer install --optimize-autoloader --prefer-source; fi; + - if [[ $TRAVIS_PHP_VERSION = 7.* ]];then travis_retry composer remove --no-update phpunit/phpunit; travis_retry composer require --dev phpunit/phpunit --sort-packages --optimize-autoloader --update-with-dependencies --prefer-source; fi; - travis_retry npm install before_script: - mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;' diff --git a/composer.json b/composer.json index a41e3a86f2..b630e811d9 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,8 @@ "zend/gdata": "~1.12.1" }, "require-dev": { - "mikey179/vfsStream": "~1.5" + "mikey179/vfsStream": "~1.5", + "phpunit/phpunit": "^4.8" }, "autoload": { "psr-0": {