diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TwigBridge] Require twig ^1.40|^2.9

Browse Source
This commit is contained in:
Robin Chalas 2019-04-28 00:09:28 +02:00
parent e10dd789b2
commit 0e29e392f2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
View File

@ -24,7 +24,6 @@ use Twig\Node\ModuleNode;
use Twig\Node\Node; use Twig\Node\Node;
use Twig\Node\SetNode; use Twig\Node\SetNode;
use Twig\NodeVisitor\AbstractNodeVisitor; use Twig\NodeVisitor\AbstractNodeVisitor;
use Twig\TokenParser\ApplyTokenParser;
/** /**
* @author Fabien Potencier <fabien@symfony.com> * @author Fabien Potencier <fabien@symfony.com>
@ -96,8 +95,7 @@ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
protected function doLeaveNode(Node $node, Environment $env) protected function doLeaveNode(Node $node, Environment $env)
{ {
if ($node instanceof TransDefaultDomainNode) { if ($node instanceof TransDefaultDomainNode) {
// must return null as of Twig 2.9 return null;
return class_exists(ApplyTokenParser::class) ? null : false;
} }
if ($node instanceof BlockNode || $node instanceof ModuleNode) { if ($node instanceof BlockNode || $node instanceof ModuleNode) {

2
src/Symfony/Bridge/Twig/composer.json
View File

@ -17,7 +17,7 @@
], ],
"require": { "require": {
"php": "^5.5.9|>=7.0.8", "php": "^5.5.9|>=7.0.8",
"twig/twig": "^1.37.1|^2.6.2" "twig/twig": "^1.40|^2.9"
}, },
"require-dev": { "require-dev": {
"symfony/asset": "~2.8|~3.0|~4.0", "symfony/asset": "~2.8|~3.0|~4.0",