Misc: Updated Composer and Travis configuration for PHP 7 and PHPUnit 5.

udan11 · udan11 · commit d888929271c4 · 2016-01-10T17:15:31.000+02:00
Misc: Updated .gitignore to ignore composer.lock.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/
 vendor/
-coverage.xml
+.composer.json
+coverage.xml
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,9 @@ language: php
 php:
   - 5.5
   - 5.6
-  - hhvm
+  - 7.0
   - nightly
+  - hhvm
   - hhvm-nightly
 
 matrix:
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "phpunit/php-code-coverage": "~2.0",
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "~4.8 || ~5.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock

-Original file line number
+Diff line change
 php:
   - 5.5
   - 5.6
 -  - hhvm
 +  - 7.0
   - nightly
 +  - hhvm
   - hhvm-nightly
 matrix: