From b8510cacec32cc1230c07f3a7bf8eb4f6c18cea7 Mon Sep 17 00:00:00 2001
From: Peter Gribanov <info@peter-gribanov.ru>
Date: Thu, 19 Mar 2020 13:53:13 +0300
Subject: [PATCH] Allow use Twig 3

use PHPUnit 6.5 for Twig 3

require symfony/yaml for load services config file
---
 .travis.yml   | 6 ++++++
 composer.json | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3340970..44af6d8 100644
--- 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
index 0a3be69..ed5ffac 100644
--- 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"