update phpunit

shijunjun · Mar 6, 2015 · 54a2c49 · 54a2c49
1 parent fd46a6e
commit 54a2c49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,12 +20,13 @@ cache:
 # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
 matrix:
   fast_finish: true
-#  allow_failures:
-#    - php: hhvm-nightly
+  allow_failures:
+    - php: hhvm-nightly
+    - php: 7.0
 
 install:
   - composer self-update && composer --version
-  - composer install --dev --prefer-dist
+  - composer install --prefer-dist
 
 script:
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 		"lib-pcre": "*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "3.7.*",
+		"phpunit/phpunit": "4.1.*",
 		"facebook/xhprof": "*@dev",
 		"cebe/indent": "*"
 	},