Merge branch 'Spomky-patch-1'

matthiasnoback · Jan 19, 2016 · 693b1aa · 693b1aa
2 parents f5370ae + 2a818e0
commit 693b1aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ matrix:
       env: SYMFONY_VERSION=2.3.*
     - php: 5.6
       env: SYMFONY_VERSION=2.7.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.0.*
 
 before_install:
   - composer require --dev --no-update symfony/framework-bundle "$SYMFONY_VERSION"

diff --git a/composer.json b/composer.json
@@ -24,13 +24,13 @@
     },
     "require": {
         "php": ">=5.3",
-        "symfony/http-kernel": "~2.3",
-        "symfony/dependency-injection": "~2.3",
-        "symfony/config": "~2.3"
+        "symfony/http-kernel": "^2.3|^3.0",
+        "symfony/dependency-injection": "^2.3|^3.0",
+        "symfony/config": "^2.3|^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "symfony/framework-bundle": "~2.3",
-        "satooshi/php-coveralls": "^0.6.1"
+        "phpunit/phpunit": "^4.0|^5.0",
+        "symfony/framework-bundle": "^2.3|^3.0",
+        "satooshi/php-coveralls": "^1.0.0"
     }
 }