Browse Source

Use composer installed PHPUnit vs. whatever is on travis.ci

Lock down to an older PHPUnit until we can get session code re-written.
The latest PHPUnit 3.7.x breaks session support which we need for the
time being.
mark_story 12 years ago
parent
commit
5223631dcd
2 changed files with 3 additions and 2 deletions
  1. 2 1
      .travis.yml
  2. 1 1
      composer.json

+ 2 - 1
.travis.yml

@@ -42,7 +42,8 @@ before_script:
   - set +H
 
 script:
-  - sh -c "if [ '$PHPCS' != '1' ]; then phpunit --stderr; else phpcs -p --extensions=php --standard=CakePHP ./src ./tests; fi"
+  - sh -c "if [ '$PHPCS' != '1' ]; then vendor/bin/phpunit --stderr; fi"
+  - sh -c "if [ '$PHPCS' = '1' ]; then phpcs -p --extensions=php --standard=CakePHP ./src ./tests; fi"
 
 notifications:
   email: false

+ 1 - 1
composer.json

@@ -24,7 +24,7 @@
         "nesbot/Carbon": "1.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.33"
     },
     "autoload": {
         "psr-4": {