Merge pull request #44 from peter-gribanov/twig3

Allow use twig 3
gpslab · Mar 19, 2020 · 1523291 · 1523291
2 parents 7e15e75 + b8510ca
commit 1523291
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -44,9 +44,11 @@ jobs:
           php: 7.1
 
         - stage: Test
+          env: PHPUNIT_VERSION=6.5.*
           php: 7.2
 
         - stage: Test
+          env: PHPUNIT_VERSION=6.5.*
           php: 7.3
 
         - stage: Test Symfony
@@ -91,6 +93,10 @@ jobs:
           env: TWIG_VERSION=2.*
           php: 7.0
 
+        - stage: Test Twig
+          env: TWIG_VERSION=3.* PHPUNIT_VERSION=6.5.*
+          php: 7.2
+
         - stage: Test SensioFrameworkExtraBundle
           env: SENSIO_FRAMEWORK=3.*
           php: 5.5

diff --git a/composer.json b/composer.json
@@ -22,9 +22,10 @@
     "symfony/expression-language": "~2.3|~3.0|~4.0|~5.0",
     "symfony/config": "~2.3|~3.0|~4.0|~5.0",
     "symfony/routing": "~2.3|~3.0|~4.0|~5.0",
+    "symfony/yaml": "~2.3|~3.0|~4.0|~5.0",
     "sensio/framework-extra-bundle": "~3.0|~4.0|~5.0",
     "doctrine/orm": "~2.4|~2.5|~2.6",
-    "twig/twig": "^1.34|^2.0"
+    "twig/twig": "^1.34|^2.0|^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8.36"