Merge pull request #67 from vveselinov/sf3-compat

Add Symfony 3.x to dependencies alongside 2.x
thephpleague · Jan 13, 2016 · 91d0db0 · 91d0db0
2 parents 1635924 + 83d2e8f
commit 91d0db0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,29 @@ env:
   - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.1"
   - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.*"
   - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.*"
+  - SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.1"
+  - SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.1"
+  - SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.*"
+  - SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.*"
+
+matrix:
+  exclude:
+    - php: 5.3
+      env: SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.1"
+    - php: 5.3
+      env: SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.1"
+    - php: 5.3
+      env: SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.*"
+    - php: 5.3
+      env: SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.*"
+    - php: 5.4
+      env: SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.1"
+    - php: 5.4
+      env: SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.1"
+    - php: 5.4
+      env: SYMFONY_VERSION="3.0" GUZZLE_VERSION="3.*"
+    - php: 5.4
+      env: SYMFONY_VERSION="3.*" GUZZLE_VERSION="3.*"
 
 before_script:
   - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-update

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "require": {
         "php": ">=5.3.2",
         "guzzle/guzzle": "~3.9",
-        "symfony/http-foundation": "~2.1"
+        "symfony/http-foundation": "~2.1|~3.0"
     },
     "require-dev": {
         "omnipay/tests": "~2.0"