Merge pull request #18 from ruudk/symfony-3-0

Support Symfony 3.0
SimpleBus · Jan 8, 2016 · 996cd20 · 996cd20
2 parents 26acec0 + e89b786
commit 996cd20
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,30 @@
 language: php
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
 
-before_script:
+matrix:
+  include:
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+      env: SYMFONY_VERSION=2.7.*
+    - php: 5.6
+      env: SYMFONY_VERSION=3.0.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.7.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.0.*
+
+env:
+  global:
+    - SYMFONY_VERSION=""
+
+before_install:
   - composer selfupdate
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/console "$SYMFONY_VERSION"; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/finder "$SYMFONY_VERSION"; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/process "$SYMFONY_VERSION"; fi
+
+install:
   - composer install --prefer-dist
 
 script:

diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
         "simple-bus/asynchronous-bundle": "~2.0",
         "simple-bus/asynchronous": "~2.0",
         "oldsound/rabbitmq-bundle": "~1.0",
-        "symfony/monolog-bundle": "~2.3"
+        "symfony/monolog-bundle": "~2.3 || ~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "simple-bus/jms-serializer-bundle-bridge": "~2.0",
-        "symfony/console": "~2.0",
-        "symfony/finder": "~2.0",
-        "symfony/process": "~2.0",
+        "symfony/console": "~2.0 || ~3.0",
+        "symfony/finder": "~2.0 || ~3.0",
+        "symfony/process": "~2.0 || ~3.0",
         "matthiasnoback/phpunit-asynchronicity": "~1.0",
         "satooshi/php-coveralls": "~0.6"
     },