From 0e29e392f2c3b472db027c91be6540a3e43f2ddc Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 28 Apr 2019 00:09:28 +0200 Subject: [PATCH] [TwigBridge] Require twig ^1.40|^2.9 --- .../Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php | 4 +--- src/Symfony/Bridge/Twig/composer.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php index e219faa79f..04b68ef6be 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php @@ -24,7 +24,6 @@ use Twig\Node\ModuleNode; use Twig\Node\Node; use Twig\Node\SetNode; use Twig\NodeVisitor\AbstractNodeVisitor; -use Twig\TokenParser\ApplyTokenParser; /** * @author Fabien Potencier @@ -96,8 +95,7 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor protected function doLeaveNode(Node $node, Environment $env) { if ($node instanceof TransDefaultDomainNode) { - // must return null as of Twig 2.9 - return class_exists(ApplyTokenParser::class) ? null : false; + return null; } if ($node instanceof BlockNode || $node instanceof ModuleNode) { diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 42d8bef4ac..071b25b18e 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^5.5.9|>=7.0.8", - "twig/twig": "^1.37.1|^2.6.2" + "twig/twig": "^1.40|^2.9" }, "require-dev": { "symfony/asset": "~2.8|~3.0|~4.0",