install symfony/phpunit-bridge on Travis when available

craue · Aug 2, 2015 · d2fd1bf · d2fd1bf
1 parent eab18df
commit d2fd1bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@
 /git.bat
 /phpunit-tests-run-with-coverage.bat
 /phpunit-tests-run.bat
-/phpunit.php
 /phpunit.xml
 /vendor
 /vendors-install.bat

diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
   - hhvm
 
 env:
-  - SYMFONY_VERSION="2.7.*"
+  - SYMFONY_VERSION="2.7.*" PHPUNIT_BRIDGE=true
 
 matrix:
   include:
@@ -27,10 +27,10 @@ matrix:
     - php: 5.5
       env: SYMFONY_VERSION="2.6.*"
     - php: 5.5
-      env: SYMFONY_VERSION="2.8.*" MIN_STABILITY="dev"
+      env: SYMFONY_VERSION="2.8.*" PHPUNIT_BRIDGE=true MIN_STABILITY="dev"
   allow_failures:
     - php: hhvm
-    - env: SYMFONY_VERSION="2.8.*" MIN_STABILITY="dev"
+    - env: SYMFONY_VERSION="2.8.*" PHPUNIT_BRIDGE=true MIN_STABILITY="dev"
   fast_finish: true
 
 install:

diff --git a/travis_install_dependencies.sh b/travis_install_dependencies.sh
@@ -14,6 +14,10 @@ if [ -n "${SYMFONY_VERSION:-}" ]; then
 	composer require --no-update --dev symfony/symfony:"${SYMFONY_VERSION}"
 fi
 
+if [ "${PHPUNIT_BRIDGE:-}" = true ]; then
+	composer require --no-update --dev symfony/phpunit-bridge:"${SYMFONY_VERSION}"
+fi
+
 if [ "${USE_DEPS:-}" = "lowest" ]; then
 	COMPOSER_UPDATE_ARGS="--prefer-lowest"
 fi