Merge pull request #3 from kokspflanze/improvement/php_7_test

tck · tck · commit a27b8c19874f · 2015-11-23T21:03:58.000+01:00
composer.json + travis update
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
 
 before_script:
   - composer update --prefer-source
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "imagine/imagine": "0.6.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.3.*",
+        "phpunit/phpunit": "~4.3|~5",
         "mikey179/vfsStream": "1.*",
         "squizlabs/php_codesniffer": "1.*",
         "phploc/phploc": "2.*",
