Merge 240667c into 326ab5d

Harborn-digital · Feb 27, 2017 · 2498216 · 2498216
2 parents 326ab5d + 240667c
commit 2498216
Show file tree

Hide file tree

Showing 3 changed files with 589 additions and 444 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,19 @@ matrix:
     - php: 5.5
     - php: 5.6
     - php: 7.0
+    - php: 7.0
+      env: SYMFONY_VERSION=2.8.*
+    - php: 7.1
     - php: nightly
   allow_failures:
     - php: nightly
   fast_finish: true
 
 before_install: composer self-update
 
-install: composer install
+install:
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; composer update symfony/*; fi;
+  - if [ "$SYMFONY_VERSION" = "" ]; then composer install; fi;
 
 before_script: mkdir -p build/logs
 

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "php": "^5.5 || ^7.0",
         "connectholland/tulip-api-client": "^1.0",
         "doctrine/orm": "^2.5",
-        "symfony/framework-bundle": "^3.0"
+        "symfony/framework-bundle": "^2.8 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",