Merge pull request #832 from rpkamp/update-for-symfony-3.2

Require components that no longer ship with Symfony FrameworkBundle 3.2
liip · Dec 5, 2016 · 88e542c · 88e542c
2 parents e345af3 + 88cacf3
commit 88e542c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,11 +32,10 @@ matrix:
       env: SYMFONY_VERSION=3.1.*@dev
     - php: 7.0
       env: SYMFONY_VERSION=3.2.x-dev
+    - php: 7.1
+      env: SYMFONY_VERSION=3.2.x-dev
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest"
-  allow_failures:
-    - php: 7.0
-      env: SYMFONY_VERSION=3.2.x-dev
 
 before_install:
   - composer self-update

diff --git a/composer.json b/composer.json
@@ -18,11 +18,14 @@
     "require": {
         "php": "^5.3.9|^7.0",
         "imagine/Imagine": "^0.6.3,<0.7",
+        "symfony/asset": "~2.3|~3.0",
         "symfony/filesystem": "~2.3|~3.0",
         "symfony/finder": "~2.3|~3.0",
         "symfony/framework-bundle": "~2.3|~3.0",
         "symfony/options-resolver": "~2.3|~3.0",
-        "symfony/process": "~2.3|~3.0"
+        "symfony/process": "~2.3|~3.0",
+        "symfony/templating": "~2.3|~3.0",
+        "symfony/translation": "~2.3|~3.0"
     },
     "require-dev": {
         "ext-gd": "*",