From bc7f06d494628cdaeff7acd5d46794601fc30e5c Mon Sep 17 00:00:00 2001 From: Fabien Papet Date: Thu, 12 Dec 2019 10:27:44 +0100 Subject: [PATCH 1/2] drop twig 1 support --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2259cee7..425e6fb5 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony/config": "<3.4 || >=4,<4.3", "symfony/dependency-injection": "<3.4 || >=4,<4.3", "symfony/http-kernel": "<3.4 || >=4,<4.3", - "twig/twig": ">=1,<1.38.1 || >=2,<2.12.1" + "twig/twig": ">=2,<2.12.1" }, "require-dev": { "laravel/framework": "~5.1", @@ -41,7 +41,7 @@ "symfony/config": "^3.4 || ^4.3 || ^5.0", "symfony/dependency-injection": "^3.4 || ^4.3 || ^5.0", "symfony/http-kernel": "^3.4 || ^4.3 || ^5.0", - "twig/twig": "^1.42.4 || ^2.12.1 || ~3.0", + "twig/twig": "^2.12.1 || ~3.0", "zendframework/zend-modulemanager": "~2.2", "zendframework/zend-servicemanager": "~2.2", "zendframework/zend-view": "~2.2" From acd1649195639ce87504eb3a517501b3d9fe4146 Mon Sep 17 00:00:00 2001 From: Fabien Papet Date: Thu, 12 Dec 2019 10:36:11 +0100 Subject: [PATCH 2/2] fix conflict section --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 425e6fb5..8913fc9d 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony/config": "<3.4 || >=4,<4.3", "symfony/dependency-injection": "<3.4 || >=4,<4.3", "symfony/http-kernel": "<3.4 || >=4,<4.3", - "twig/twig": ">=2,<2.12.1" + "twig/twig": "<2.12.1" }, "require-dev": { "laravel/framework": "~5.1",