diff --git a/.travis.yml b/.travis.yml
index c8ae217a29..3001e4a4c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,9 @@ before_script:
- export PATH=~/.composer/vendor/bin/:$PATH
- mysql -uroot -e "SET PASSWORD = PASSWORD('$TESTSUITE_PASSWORD')" ;
- set -e ; if [[ -z "$LINT" ]] ; then
+
+ composer install --dev --no-interaction ;
+
if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then
if [[ $TRAVIS_PHP_VERSION != "5.6" ]] ; then
@@ -37,8 +40,6 @@ before_script:
phpenv config-add test/travis.php.ini ;
fi
- composer install --dev --no-interaction ;
-
wget https://scrutinizer-ci.com/ocular.phar ;
fi ;
diff --git a/build.xml b/build.xml
index c0e5575768..88b4d260d2 100644
--- a/build.xml
+++ b/build.xml
@@ -24,19 +24,19 @@
-
+
-
+
-
+
diff --git a/composer.json b/composer.json
index e5c79ed78c..117a2c855c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
"require-dev": {
"satooshi/php-coveralls": ">=0.6",
- "phpunit/phpunit": ">=3.7",
+ "phpunit/phpunit": "<4.2",
"phpunit/phpunit-selenium": ">=1.2"
}
}