Merge pull request #182 from liip/twig-dependency

TwigBundle is a hard requirement
liip · Dec 17, 2017 · b679e2a · b679e2a
2 parents 10ac3ae + 944d5db
commit b679e2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,13 +18,12 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.2
       env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
+    - php: 7.2
       env: SYMFONY_VERSION=3.3.*
-    - php: 5.6
+    - php: 7.2
       env: SYMFONY_VERSION=3.4.*
-  include:
     - php: 7.2
       env: SYMFONY_VERSION=4.0.*;ASSETIC=skip
     - php: 7.2

diff --git a/composer.json b/composer.json
@@ -18,14 +18,15 @@
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "^2.7|^3.0|^4.0",
         "symfony/finder": "^2.7|^3.0|^4.0",
+        "symfony/twig-bundle": "^2.7|^3.0|^4.0",
+        "symfony/templating": "^2.7|^3.0|^4.0",
+        "twig/twig": "^1.27|^2.0",
         "psr/log": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35|^6.0",
         "symfony/console": "^2.7|^3.0|^4.0",
-        "symfony/expression-language": "^2.7|^3.0|^4.0",
-        "symfony/templating": "^2.7|^3.0|^4.0",
-        "twig/twig": "^1.27|^2.0"
+        "symfony/expression-language": "^2.7|^3.0|^4.0"
     },
     "autoload": {
         "psr-4": { "Liip\\ThemeBundle\\": "" }