From 12c79aebe1a3ab3f88a9472ad70343dd2d26e195 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@mphuis.com>
Date: Mon, 7 Dec 2015 20:43:25 +0100
Subject: [PATCH] Added support for Symfony 3.0 and PHP 7.0

---
 .travis.yml   | 131 ++++++++++++++++++++++++++++++++++++++++++--------
 composer.json |  14 +++---
 2 files changed, 119 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 983d0e02..0aaa94c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,117 @@
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
 matrix:
-    allow_failures:
-        - php: hhvm
+  allow_failures:
+    - php: hhvm
+      env: SYMFONY_VERSION=2.3.*
+    - php: hhvm
+      env: SYMFONY_VERSION=2.4.*
+    - php: hhvm
+      env: SYMFONY_VERSION=2.5.*
+    - php: hhvm
+      env: SYMFONY_VERSION=2.6.*
+    - php: hhvm
+      env: SYMFONY_VERSION=2.7.*
+    - php: hhvm
+      env: SYMFONY_VERSION=2.8.*
+
+  include:
+    - php: 5.3
+      env: SYMFONY_VERSION=2.3.*
+    - php: 5.3
+      env: SYMFONY_VERSION=2.4.*
+    - php: 5.3
+      env: SYMFONY_VERSION=2.5.*
+    - php: 5.3
+      env: SYMFONY_VERSION=2.6.*
+    - php: 5.3
+      env: SYMFONY_VERSION=2.7.*
+    - php: 5.3
+      env: SYMFONY_VERSION=2.8.*
+
+    - php: 5.4
+      env: SYMFONY_VERSION=2.3.*
+    - php: 5.4
+      env: SYMFONY_VERSION=2.4.*
+    - php: 5.4
+      env: SYMFONY_VERSION=2.5.*
+    - php: 5.4
+      env: SYMFONY_VERSION=2.6.*
+    - php: 5.4
+      env: SYMFONY_VERSION=2.7.*
+    - php: 5.4
+      env: SYMFONY_VERSION=2.8.*
+
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.3.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.4.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.5.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.6.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.7.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=2.8.*
+        - PHPUNIT_VERSION=4.8.*
+    - php: 5.5
+      env:
+        - SYMFONY_VERSION=3.0.*
+        - PHPUNIT_VERSION=4.8.*
+
+    - 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.7.*
+    - php: 5.6
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.6
+      env: SYMFONY_VERSION=3.0.*
+
+    - php: 7.0
+      env: SYMFONY_VERSION=2.3.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.4.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.5.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.6.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.7.*
+    - php: 7.0
+      env: SYMFONY_VERSION=2.8.*
+    - php: 7.0
+      env: SYMFONY_VERSION=3.0.*
 
 env:
-    - SYMFONY_VERSION="2.3.*"
-    - SYMFONY_VERSION="2.4.*"
-    - SYMFONY_VERSION="2.5.*"
-    - SYMFONY_VERSION="2.6.*"
-    - SYMFONY_VERSION="2.7.*"
-
-before_script:
-    - composer self-update
-    - composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}
-    - composer install --prefer-source
+  global:
+    - PHPUNIT_VERSION=""
+    - SYMFONY_VERSION=""
+
+before_install:
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/framework-bundle "$SYMFONY_VERSION"; fi
+  - if [ "$PHPUNIT_VERSION" != "" ]; then composer require --dev --no-update phpunit/phpunit "$PHPUNIT_VERSION"; fi
+
+install:
+  - composer install --prefer-source
+
+script:
+  - vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 69c57a6c..21a1cdce 100644
--- a/composer.json
+++ b/composer.json
@@ -9,19 +9,19 @@
     }],
     "require": {
         "php"                          : ">=5.3.0",
-        "symfony/dependency-injection" : "~2.3",
-        "symfony/event-dispatcher"     : "~2.3",
-        "symfony/config"               : "~2.3",
-        "symfony/yaml"                 : "~2.3",
-        "symfony/console"              : "~2.3",
+        "symfony/dependency-injection" : "~2.3 || ~3.0",
+        "symfony/event-dispatcher"     : "~2.3 || ~3.0",
+        "symfony/config"               : "~2.3 || ~3.0",
+        "symfony/yaml"                 : "~2.3 || ~3.0",
+        "symfony/console"              : "~2.3 || ~3.0",
         "videlalvaro/php-amqplib"      : "~2.6"
     },
     "suggest": {
         "symfony/framework-bundle" : "To use this lib as a full Symfony Bundle and to use the profiler data collector"
     },
     "require-dev": {
-        "symfony/serializer": "~2.3",
-        "symfony/debug"     : "~2.3",
+        "symfony/serializer": "~2.3 || ~3.0",
+        "symfony/debug"     : "~2.3 || ~3.0",
         "phpunit/phpunit" : ">=3.7.0"
     },
     "extra": {