From 0723634173ceb6ea0d425319cb7d19033835a602 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Tue, 20 Aug 2019 07:35:35 -0300 Subject: [PATCH] Replace "twig/twig" requirement with "symfony/twig-bundle" --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c9e4e40c..9fad192b 100644 --- a/composer.json +++ b/composer.json @@ -40,9 +40,9 @@ "symfony/options-resolver": "^2.8 || ^3.0 || ^4.0", "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0", "symfony/translation": "^2.8 || ^3.0 || ^4.0", + "symfony/twig-bundle": "^2.8 || ^3.0 || ^4.0", "symfony/validator": "^2.8 || ^3.0 || ^4.0", - "symfony/yaml": "^2.8 || ^3.0 || ^4.0", - "twig/twig": "^1.34 || ^2.0" + "symfony/yaml": "^2.8 || ^3.0 || ^4.0" }, "require-dev": { "ext-pdo_sqlite": "*", @@ -51,7 +51,8 @@ "symfony/security": "^2.8 || ^3.0 || ^4.0" }, "conflict": { - "phpunit/phpunit": "<5.4.3" + "phpunit/phpunit": "<5.4.3", + "twig/twig": "<1.34" }, "suggest": { "friendsofsymfony/user-bundle": "In order to ease user management",