minor symfony#31297 [TwigBridge] Require Twig ^1.40|^2.9 (chalasr)

fabpot · fabpot · commit 73880db34432 · 2019-04-28T07:59:24.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] Require Twig ^1.40|^2.9 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | n/a | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Reverts symfony#31281 Commits ------- 0e29e39 [TwigBridge] Require twig ^1.40|^2.9
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -24,7 +24,6 @@
 use Twig\Node\Node;
 use Twig\Node\SetNode;
 use Twig\NodeVisitor\AbstractNodeVisitor;
-use Twig\TokenParser\ApplyTokenParser;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -96,8 +95,7 @@ protected function doEnterNode(Node $node, Environment $env)
     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
@@ -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",
