Skip to content

Commit be77539

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: [TwigBridge] Fix `ModuleNode` call in `TwigNodeProvider` fix compatibility with Doctrine ORM 4 Fix CS
2 parents 45c00af + 4d706f1 commit be77539

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Tests/NodeVisitor/TwigNodeProvider.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
1515
use Symfony\Bridge\Twig\Node\TransNode;
1616
use Twig\Node\BodyNode;
17+
use Twig\Node\EmptyNode;
1718
use Twig\Node\Expression\ArrayExpression;
1819
use Twig\Node\Expression\ConstantExpression;
1920
use Twig\Node\Expression\FilterExpression;
@@ -27,13 +28,15 @@ class TwigNodeProvider
2728
{
2829
public static function getModule($content)
2930
{
31+
$emptyNodeExists = class_exists(EmptyNode::class);
32+
3033
return new ModuleNode(
3134
new BodyNode([new ConstantExpression($content, 0)]),
3235
null,
33-
new ArrayExpression([], 0),
34-
new ArrayExpression([], 0),
35-
new ArrayExpression([], 0),
36-
null,
36+
$emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
37+
$emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
38+
$emptyNodeExists ? new EmptyNode() : new ArrayExpression([], 0),
39+
$emptyNodeExists ? new EmptyNode() : null,
3740
new Source('', '')
3841
);
3942
}

0 commit comments

Comments
 (0)