mirror of
https://github.com/twigphp/Twig.git
synced 2026-10-05 11:27:26 +00:00
Rename Node classes related to variables
This commit is contained in:
@@ -23,8 +23,8 @@ use Twig\Node\Expression\Binary\ConcatBinary;
|
||||
use Twig\Node\Expression\ConstantExpression;
|
||||
use Twig\Node\Expression\FilterExpression;
|
||||
use Twig\Node\Expression\FunctionExpression;
|
||||
use Twig\Node\Expression\NameExpression;
|
||||
use Twig\Node\Expression\TestExpression;
|
||||
use Twig\Node\Expression\Variable\ContextVariable;
|
||||
use Twig\Node\Node;
|
||||
use Twig\Parser;
|
||||
use Twig\Source;
|
||||
@@ -175,9 +175,9 @@ class ExpressionParserTest extends TestCase
|
||||
],
|
||||
['{{ {a, b} }}', new ArrayExpression([
|
||||
new ConstantExpression('a', 1),
|
||||
new NameExpression('a', 1),
|
||||
new ContextVariable('a', 1),
|
||||
new ConstantExpression('b', 1),
|
||||
new NameExpression('b', 1),
|
||||
new ContextVariable('b', 1),
|
||||
], 1)],
|
||||
|
||||
// sequence with spread operator
|
||||
@@ -190,7 +190,7 @@ class ExpressionParserTest extends TestCase
|
||||
new ConstantExpression(2, 1),
|
||||
|
||||
new ConstantExpression(2, 1),
|
||||
self::createNameExpression('foo', ['spread' => true]),
|
||||
self::createContextVariable('foo', ['spread' => true]),
|
||||
], 1)],
|
||||
|
||||
// mapping with spread operator
|
||||
@@ -203,7 +203,7 @@ class ExpressionParserTest extends TestCase
|
||||
new ConstantExpression('c', 1),
|
||||
|
||||
new ConstantExpression(0, 1),
|
||||
self::createNameExpression('otherLetters', ['spread' => true]),
|
||||
self::createContextVariable('otherLetters', ['spread' => true]),
|
||||
], 1)],
|
||||
];
|
||||
}
|
||||
@@ -237,7 +237,7 @@ class ExpressionParserTest extends TestCase
|
||||
[
|
||||
'{{ "foo #{bar}" }}', new ConcatBinary(
|
||||
new ConstantExpression('foo ', 1),
|
||||
new NameExpression('bar', 1),
|
||||
new ContextVariable('bar', 1),
|
||||
1
|
||||
),
|
||||
],
|
||||
@@ -245,7 +245,7 @@ class ExpressionParserTest extends TestCase
|
||||
'{{ "foo #{bar} baz" }}', new ConcatBinary(
|
||||
new ConcatBinary(
|
||||
new ConstantExpression('foo ', 1),
|
||||
new NameExpression('bar', 1),
|
||||
new ContextVariable('bar', 1),
|
||||
1
|
||||
),
|
||||
new ConstantExpression(' baz', 1),
|
||||
@@ -260,7 +260,7 @@ class ExpressionParserTest extends TestCase
|
||||
new ConcatBinary(
|
||||
new ConcatBinary(
|
||||
new ConstantExpression('foo ', 1),
|
||||
new NameExpression('bar', 1),
|
||||
new ContextVariable('bar', 1),
|
||||
1
|
||||
),
|
||||
new ConstantExpression(' baz', 1),
|
||||
@@ -564,9 +564,9 @@ class ExpressionParserTest extends TestCase
|
||||
$this->expectNotToPerformAssertions();
|
||||
}
|
||||
|
||||
private static function createNameExpression(string $name, array $attributes): NameExpression
|
||||
private static function createContextVariable(string $name, array $attributes): ContextVariable
|
||||
{
|
||||
$expression = new NameExpression($name, 1);
|
||||
$expression = new ContextVariable($name, 1);
|
||||
foreach ($attributes as $key => $value) {
|
||||
$expression->setAttribute($key, $value);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user