Merge 28b790e into d008d5a

ta2edchimp · Jun 20, 2016 · 03fd14f · 03fd14f
2 parents d008d5a + 28b790e
commit 03fd14f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,17 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
   - nightly
+  - hhvm
+  - hhvm-nightly
 
+matrix:
+    allow_failures:
+        - php: nightly
+        - php: hhvm
+        - php: hhvm-nightly
 env:
   - DB=mysql
 

diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
     "description": "Advanced editable BattleReport platform for EVE Online.",
     "license": "Beerware",
     "require": {
+        "php": ">=5.4",
         "twig/twig": "~1.0",
         "slim/slim": "2.*",
         "slim/views": "0.1.*",
@@ -16,6 +17,6 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require-dev": {
-        "atoum/atoum": "~2.2"
+        "atoum/atoum": "~2.7"
     }
 }