Merge pull request #10 from Padam87/sf3

Sf3
Padam87 · Feb 4, 2016 · 696e9c2 · 696e9c2
2 parents 90395b0 + e64d850
commit 696e9c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,18 @@ language: php
 
 php:
   - 5.3
-  - 5.4
-  - 5.5
   - 5.6
 
 env:
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=2.5.*
-  - SYMFONY_VERSION=2.6.*
+  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION=3.0.*
+
+matrix:
+  fast_finish: true
+  exclude:
+    - php: 5.3
+      env: SYMFONY_VERSION=3.0.*
 
 before_script:
   - composer require symfony/symfony:${SYMFONY_VERSION} --no-update

diff --git a/composer.json b/composer.json
@@ -16,14 +16,14 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/process": "~2.3",
-        "symfony/stopwatch": "~2.3",
-        "symfony/routing": "~2.3"
+        "symfony/process": "~2.3|~3.0",
+        "symfony/stopwatch": "~2.3|~3.0",
+        "symfony/routing": "~2.3|~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.2",
         "mockery/mockery": "~0.9",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "~1.0"
     },
     "target-dir": "Padam87/RasterizeBundle"
 }