Merge pull request #1736 from nfx/patch-1

Travis using PHPUnit version from require-dev
2013-03-27 13:25:36 -07:00 · 2013-03-27 13:25:36 -07:00 · 6f0a71a158
parent 3cc5698e7b 31b6dd8356
commit 6f0a71a158
1 changed files with 4 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,6 +6,8 @@ php:
  - 5.4
  - 5.5

-before_script: composer install --prefer-source
+before_script: 
+    - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+    - composer install --dev --prefer-source

-script: phpunit -c tests/complete.phpunit.xml
+script: ./vendor/bin/phpunit -c tests/complete.phpunit.xml