set an upper bound for php, remove symfony 2.4/2.5/2.6 from build matrix

liip · Oct 25, 2015 · 0cfc627 · 0cfc627
1 parent 34aded1
commit 0cfc627
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ sudo: false
 
 cache:
   directories:
-    - $HOME/.composer/cache
+    - $HOME/.composer/cache/files
 
 env:
   - SYMFONY_VERSION=2.7.*
@@ -21,22 +21,16 @@ matrix:
   include:
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.4.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.5.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.6.*
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*@dev
     - php: 5.6
       env: SYMFONY_VERSION=3.0.*@dev
     - php: 5.3
-      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
+      env: COMPOSER_FLAGS="--prefer-lowest"
 
 before_install:
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
 
 install: composer update --prefer-source $COMPOSER_FLAGS
 

diff --git a/composer.json b/composer.json
@@ -14,13 +14,14 @@
     ],
 
     "require": {
-        "php":                      ">=5.3.9",
-        "Org_Heigl/Hyphenator":     "~2.0",
-        "twig/twig":                "~1.20|~2.0",
+        "php": "^5.3.9|^7.0",
+        "Org_Heigl/Hyphenator": "~2.0",
+        "twig/twig": "~1.20|~2.0",
         "symfony/framework-bundle": "~2.3|~3.0"
     },
 
     "require-dev": {
+        "symfony/dependency-injection": "~2.3|~3.0",
         "symfony/twig-bundle": "~2.3|~3.0",
         "symfony/browser-kit": "~2.3|~3.0"
     },