Avoid using PHPunit from vendor

symfony-cmf · Jan 26, 2017 · f55843e · f55843e
1 parent 926156f
commit f55843e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,11 +34,15 @@ before_install:
 
 install: composer update --prefer-dist $COMPOSER_FLAGS
 
-before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+before_script:
+  - mv vendor/phpunit ./phpunit
+  - composer dump-autoload
+  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script:
   - vendor/bin/simple-phpunit
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/symfony-cmf/testing/bin/server & fi
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv ./phpunit vendor/phpunit; composer dump-autoload; fi
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/behat; fi
 
 notifications:

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "symfony-cmf/testing": "^2.0",
         "symfony/phpunit-bridge": "^3.2",
         "doctrine/phpcr-odm": "^1.3",
-        "behat/behat": "^3.0",
+        "behat/behat": "^3.0.5",
         "behat/web-api-extension" : "^1.0@dev",
         "behat/symfony2-extension": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",