geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-20 14:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code

Browse Source
This commit is contained in:
Fabien Potencier
2024-10-25 07:35:14 +02:00
parent f3db1d1a0c
commit 89fdc7d31d
9 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Node/ImportTest.php
+4 -3
View File
@@ -13,6 +13,7 @@ namespace Twig\Tests\Node;
use Twig\Node\Expression\ConstantExpression;
use Twig\Node\Expression\Variable\AssignTemplateVariable;
use Twig\Node\Expression\Variable\TemplateVariable;
use Twig\Node\ImportNode;
use Twig\Test\NodeTestCase;
@@ -21,10 +22,10 @@ class ImportTest extends NodeTestCase
public function testConstructor()
{
$macro = new ConstantExpression('foo.twig', 1);
$node = new ImportNode($macro, new AssignTemplateVariable('macro', 1), 1);
$node = new ImportNode($macro, new AssignTemplateVariable(new TemplateVariable('macro', 1), true), 1);
$this->assertEquals($macro, $node->getNode('expr'));
$this->assertEquals('macro', $node->getNode('var')->getAttribute('name'));
$this->assertEquals('macro', $node->getNode('var')->getNode('var')->getAttribute('name'));
}
public static function provideTests(): iterable
@@ -32,7 +33,7 @@ class ImportTest extends NodeTestCase
$tests = [];
$macro = new ConstantExpression('foo.twig', 1);
$node = new ImportNode($macro, new AssignTemplateVariable('macro', 1), 1);
$node = new ImportNode($macro, new AssignTemplateVariable(new TemplateVariable('macro', 1), true), 1);
$tests[] = [$node, <<<EOF
// line 1
tests/Node/ModuleTest.php
+2 -1
View File
@@ -19,6 +19,7 @@ use Twig\Node\Expression\ConditionalExpression;
use Twig\Node\Expression\ConstantExpression;
use Twig\Node\Expression\Variable\AssignContextVariable;
use Twig\Node\Expression\Variable\AssignTemplateVariable;
use Twig\Node\Expression\Variable\TemplateVariable;
use Twig\Node\ImportNode;
use Twig\Node\ModuleNode;
use Twig\Node\Nodes;
@@ -131,7 +132,7 @@ class __TwigTemplate_%x extends Template
EOF
, $twig, true];
$import = new ImportNode(new ConstantExpression('foo.twig', 1), new AssignTemplateVariable('macro', 2), 2);
$import = new ImportNode(new ConstantExpression('foo.twig', 1), new AssignTemplateVariable(new TemplateVariable('macro', 2), true), 2);
$body = new BodyNode([$import]);
$extends = new ConstantExpression('layout.twig', 1);