Added symfony 3.0 support

boekkooi · Dec 2, 2015 · 9526e8c · 9526e8c
1 parent ea12942
commit 9526e8c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,15 @@ php:
 matrix:
   include:
     - php: 5.5
-      env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - COVERAGE="--coverage-clover=coverage.xml"
+      env: |
+        COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        COVERAGE="--coverage-clover=coverage.xml"
+    - php: 5.6
+      env: SYMFONY_VERSION="2.7.*"
+    - php: 5.6
+      env: SYMFONY_VERSION="2.8.*"
+    - php: 5.6
+      env: SYMFONY_VERSION="3.0.*"
   allow_failures:
     - php: 7.0
 
@@ -19,6 +25,7 @@ install:
   - travis_retry wget http://get.sensiolabs.org/php-cs-fixer.phar -O php-cs-fixer.phar
 
 before_script:
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
 

diff --git a/composer.json b/composer.json
@@ -11,17 +11,17 @@
     }
   ],
   "require": {
-    "symfony/framework-bundle": "~2.3",
-    "symfony/yaml": "~2.3",
-    "symfony/serializer": "~2.3",
-    "symfony/console": "~2.3",
-    "symfony/dependency-injection": "~2.3,>=2.3.3",
+    "symfony/framework-bundle": "~2.3|~3.0",
+    "symfony/yaml": "~2.3|~3.0",
+    "symfony/serializer": "~2.3|~3.0",
+    "symfony/console": "~2.3|~3.0",
+    "symfony/dependency-injection": "~2.3,>=2.3.3|~3.0",
 
     "league/tactician-bundle": "^0.3",
     "boekkooi/tactician-amqp": "^0.2"
   },
   "require-dev": {
-    "symfony/finder": "~2.3",
+    "symfony/finder": "~2.3|~3.0",
 
     "phpunit/phpunit": "~4.8",
     "mockery/mockery": "~0.9, >= 0.9.4",

diff --git a/src/Resources/config/services/amqp.yml b/src/Resources/config/services/amqp.yml
@@ -6,6 +6,6 @@ services:
   boekkooi.amqp.abstract.consumer.queue_locator:
     class: %boekkooi.amqp.consumer.queue_locator.class%
     arguments:
-      - @service_container
+      - "@service_container"
     abstract: true
     public: false
diff --git a/src/Resources/config/services/tactician.yml b/src/Resources/config/services/tactician.yml
@@ -23,20 +23,20 @@ services:
   boekkooi.amqp.tactician.exchange_locator:
     class: %boekkooi.amqp.tactician.exchange_locator.class%
     arguments:
-      - @service_container
+      - "@service_container"
 
   boekkooi.amqp.tactician.publisher_locator:
     class: %boekkooi.amqp.tactician.publisher_locator.class%
 
   boekkooi.amqp.tactician.publisher.basic:
     class: %boekkooi.amqp.tactician.publisher.basic.class%
     arguments:
-      - @boekkooi.amqp.tactician.exchange_locator
+      - "@boekkooi.amqp.tactician.exchange_locator"
 
   boekkooi.amqp.tactician.publisher.rpc:
     class: %boekkooi.amqp.tactician.publisher.rpc.class%
     arguments:
-      - @boekkooi.amqp.tactician.exchange_locator
+      - "@boekkooi.amqp.tactician.exchange_locator"
 
   ## Transformer related ##
   boekkooi.amqp.tactician.serializer:
@@ -45,42 +45,42 @@ services:
   boekkooi.amqp.tactician.command_transformer:
     class: %boekkooi.amqp.tactician.command_transformer.class%
     arguments:
-      - @boekkooi.amqp.tactician.serializer
+      - "@boekkooi.amqp.tactician.serializer"
       - %boekkooi.amqp.tactician.serializer.format%
 
   boekkooi.amqp.tactician.envelope_transformer:
     class: %boekkooi.amqp.tactician.envelope_transformer.class%
     arguments:
-      - @boekkooi.amqp.tactician.serializer
+      - "@boekkooi.amqp.tactician.serializer"
       - %boekkooi.amqp.tactician.serializer.format%
 
   boekkooi.amqp.tactician.response_transformer:
     class: %boekkooi.amqp.tactician.response_transformer.class%
     arguments:
-      - @boekkooi.amqp.tactician.serializer
+      - "@boekkooi.amqp.tactician.serializer"
       - %boekkooi.amqp.tactician.serializer.format%
 
   ## Tactician middleware ##
   boekkooi.amqp.middleware.publish:
     class: %boekkooi.amqp.middleware.publish.class%
     arguments:
-      - @boekkooi.amqp.tactician.publisher_locator
+      - "@boekkooi.amqp.tactician.publisher_locator"
 
   boekkooi.amqp.middleware.consume:
     class: %boekkooi.amqp.middleware.consume.class%
 
   boekkooi.amqp.middleware.remote_response:
     class: %boekkooi.amqp.middleware.remote_response.class%
     arguments:
-      - @boekkooi.amqp.tactician.response_transformer
+      - "@boekkooi.amqp.tactician.response_transformer"
 
   boekkooi.amqp.middleware.command_transformer:
     class: %boekkooi.amqp.middleware.command_transformer.class%
     arguments:
-      - @boekkooi.amqp.tactician.command_transformer
+      - "@boekkooi.amqp.tactician.command_transformer"
       - []
 
   boekkooi.amqp.middleware.envelope_transformer:
     class: %boekkooi.amqp.middleware.envelope_transformer.class%
     arguments:
-      - @boekkooi.amqp.tactician.envelope_transformer
+      - "@boekkooi.amqp.tactician.envelope_transformer"