Merge pull request #378 from FriendsOfSymfony/fix-legacy-build

fix legacy build

Author: dbu

.travis.yml

@@ -17,10 +17,9 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
 
 env:
-  - SYMFONY_VERSION='3.0.*'
+  - SYMFONY_VERSION='3.2.*'
 
 branches:
   only:
@@ -35,9 +34,10 @@ matrix:
         - SYMFONY_VERSION='2.3.*'
     - php: 5.6
       env:
-        - SYMFONY_VERSION='2.4.*'
+        - SYMFONY_VERSION='3.2.*'
         - PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
         - COVERAGE=true
+        - DOCCHECK=true
     - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
     - php: 5.6
@@ -60,10 +60,6 @@ matrix:
       env:
         - SYMFONY_VERSION='2.8.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.6
-      env:
-        - SYMFONY_VERSION='3.0.*'
-        - FRAMEWORK_EXTRA_VERSION='~3.0'
     - php: 5.6
       env:
         - SYMFONY_VERSION='3.1.*'
@@ -72,21 +68,23 @@ matrix:
       env:
         - SYMFONY_VERSION='3.2.*'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
+    - php: hhvm
+      dist: trusty
 
 install:
-  - pip install -qr Resources/doc/requirements.txt --user
+  - if [ "$DOCCHECK" = true ]; then pip install -qr Resources/doc/requirements.txt --user; fi
 
 before_install:
-  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
-  - sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi;'
+  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi'
+  - sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi'
 
 before_script:
   - composer update $COMPOSER_FLAGS
 
 script:
-  - SYMFONY_DEPRECATIONS_HELPER=weak phpunit ${PHPUNIT_FLAGS}
-  - make -C Resources/doc SPHINXOPTS='-nW' html
-  - make -C Resources/doc spelling
+  - SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/simple-phpunit ${PHPUNIT_FLAGS}
+  - if [ "$DOCCHECK" = true ]; then make -C Resources/doc SPHINXOPTS='-nW' html; fi
+  - if [ "$DOCCHECK" = true ]; then make -C Resources/doc spelling; fi
 
 after_script:
   - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

composer.json

@@ -30,7 +30,7 @@
         "monolog/monolog": "*",
         "sensio/framework-extra-bundle": "^2.3||^3.0",
         "symfony/symfony": "^2.3.4||^3.0",
-        "symfony/phpunit-bridge": "^2.7||^3.0",
+        "symfony/phpunit-bridge": "^3.2",
         "symfony/expression-language": "^2.4||^3.0",
         "symfony/monolog-bundle": "^2.3||^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",