Merge pull request #26 from ThaDafinser/patch-2

php7 support
Ocramius · Mar 24, 2015 · 2883b52 · 2883b52
2 parents 07f45b1 + f867d04
commit 2883b52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.5
   - 5.6
+  - 7
   - hhvm
   - hhvm-nightly
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "~5.5",
+        "php": "~5.5|~7.0",
         "zendframework/zend-servicemanager": "~2.3",
         "zendframework/zend-mvc": "~2.3",
         "zendframework/zend-view": "~2.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ language: php @@
     php:
       - 5.5
       - 5.6
+      - 7
       - hhvm
       - hhvm-nightly
@@ Expand Down @@