Skip to content

Commit 814dec2

Browse files
fabpotfabpot
committed
minor symfony#59893 [TwigBridge] remove remaining BC layers (xabbuh)
This PR was merged into the 7.3 branch. Discussion ---------- [TwigBridge] remove remaining BC layers | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT finishes symfony#59891 Commits ------- a5ebdeb remove remaining BC layers
2 parents f2e8574 + a5ebdeb commit 814dec2

File tree

10 files changed

+41
-106
lines changed

10 files changed

+41
-106
lines changed

‎src/Symfony/Bridge/Twig/Node/TransNode.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Twig\Node\Expression\AbstractExpression;
1717
use Twig\Node\Expression\ArrayExpression;
1818
use Twig\Node\Expression\ConstantExpression;
19-
use Twig\Node\Expression\NameExpression;
2019
use Twig\Node\Expression\Variable\ContextVariable;
2120
use Twig\Node\Node;
2221
use Twig\Node\TextNode;
@@ -120,7 +119,7 @@ private function compileString(Node $body, ArrayExpression $vars, bool $ignoreSt
120119
if ('count' === $var && $this->hasNode('count')) {
121120
$vars->addElement($this->getNode('count'), $key);
122121
} else {
123-
$varExpr = class_exists(ContextVariable::class) ? new ContextVariable($var, $body->getTemplateLine()) : new NameExpression($var, $body->getTemplateLine());
122+
$varExpr = new ContextVariable($var, $body->getTemplateLine());
124123
$varExpr->setAttribute('ignore_strict_check', $ignoreStrictCheck);
125124
$vars->addElement($varExpr, $key);
126125
}

‎src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,7 @@ private function createCommandTester(): CommandTester
160160
private function createCommand(): Command
161161
{
162162
$environment = new Environment(new FilesystemLoader(\dirname(__DIR__).'/Fixtures/templates/'));
163-
if (class_exists(DeprecatedCallableInfo::class)) {
164-
$options = ['deprecation_info' => new DeprecatedCallableInfo('foo/bar', '1.1')];
165-
} else {
166-
$options = ['deprecated' => true];
167-
}
163+
$options = ['deprecation_info' => new DeprecatedCallableInfo('foo/bar', '1.1')];
168164
$environment->addFilter(new TwigFilter('deprecated_filter', fn ($v) => $v, $options));
169165

170166
$command = new LintCommand($environment);

‎src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
use Twig\Compiler;
1717
use Twig\Environment;
1818
use Twig\Loader\LoaderInterface;
19-
use Twig\Node\Expression\NameExpression;
2019
use Twig\Node\Expression\Variable\ContextVariable;
21-
use Twig\Node\Node;
2220
use Twig\Node\Nodes;
2321

2422
class DumpNodeTest extends TestCase
@@ -73,15 +71,9 @@ public function testIndented()
7371

7472
public function testOneVar()
7573
{
76-
if (class_exists(Nodes::class)) {
77-
$vars = new Nodes([
78-
new ContextVariable('foo', 7),
79-
]);
80-
} else {
81-
$vars = new Node([
82-
new NameExpression('foo', 7),
83-
]);
84-
}
74+
$vars = new Nodes([
75+
new ContextVariable('foo', 7),
76+
]);
8577

8678
$node = new DumpNode('bar', $vars, 7);
8779

@@ -103,18 +95,10 @@ public function testOneVar()
10395

10496
public function testMultiVars()
10597
{
106-
if (class_exists(Nodes::class)) {
107-
$vars = new Nodes([
108-
new ContextVariable('foo', 7),
109-
new ContextVariable('bar', 7),
110-
]);
111-
} else {
112-
$vars = new Node([
113-
new NameExpression('foo', 7),
114-
new NameExpression('bar', 7),
115-
]);
116-
}
117-
98+
$vars = new Nodes([
99+
new ContextVariable('foo', 7),
100+
new ContextVariable('bar', 7),
101+
]);
118102
$node = new DumpNode('bar', $vars, 7);
119103

120104
$env = new Environment($this->createMock(LoaderInterface::class));

‎src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
use Twig\Loader\LoaderInterface;
2222
use Twig\Node\Expression\ArrayExpression;
2323
use Twig\Node\Expression\ConstantExpression;
24-
use Twig\Node\Expression\NameExpression;
2524
use Twig\Node\Expression\Variable\ContextVariable;
26-
use Twig\Node\Node;
2725
use Twig\Node\Nodes;
2826

2927
class FormThemeTest extends TestCase
@@ -32,18 +30,11 @@ class FormThemeTest extends TestCase
3230

3331
public function testConstructor()
3432
{
35-
$form = class_exists(ContextVariable::class) ? new ContextVariable('form', 0) : new NameExpression('form', 0);
36-
if (class_exists(Nodes::class)) {
37-
$resources = new Nodes([
38-
new ConstantExpression('tpl1', 0),
39-
new ConstantExpression('tpl2', 0),
40-
]);
41-
} else {
42-
$resources = new Node([
43-
new ConstantExpression('tpl1', 0),
44-
new ConstantExpression('tpl2', 0),
45-
]);
46-
}
33+
$form = new ContextVariable('form', 0);
34+
$resources = new Nodes([
35+
new ConstantExpression('tpl1', 0),
36+
new ConstantExpression('tpl2', 0),
37+
]);
4738

4839
$node = new FormThemeNode($form, $resources, 0);
4940

@@ -54,7 +45,7 @@ public function testConstructor()
5445

5546
public function testCompile()
5647
{
57-
$form = class_exists(ContextVariable::class) ? new ContextVariable('form', 0) : new NameExpression('form', 0);
48+
$form = new ContextVariable('form', 0);
5849
$resources = new ArrayExpression([
5950
new ConstantExpression(1, 0),
6051
new ConstantExpression('tpl1', 0),

‎src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php‎

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Twig\Extension\CoreExtension;
1919
use Twig\Loader\LoaderInterface;
2020
use Twig\Node\Expression\ArrayExpression;
21-
use Twig\Node\Expression\ConditionalExpression;
2221
use Twig\Node\Expression\ConstantExpression;
2322
use Twig\Node\Expression\Ternary\ConditionalTernary;
2423
use Twig\Node\Expression\Variable\ContextVariable;
@@ -207,27 +206,15 @@ public function testCompileLabelWithLabelAndAttributes()
207206

208207
public function testCompileLabelWithLabelThatEvaluatesToNull()
209208
{
210-
if (class_exists(ConditionalTernary::class)) {
211-
$conditional = new ConditionalTernary(
212-
// if
213-
new ConstantExpression(true, 0),
214-
// then
215-
new ConstantExpression(null, 0),
216-
// else
217-
new ConstantExpression(null, 0),
218-
0
219-
);
220-
} else {
221-
$conditional = new ConditionalExpression(
222-
// if
223-
new ConstantExpression(true, 0),
224-
// then
225-
new ConstantExpression(null, 0),
226-
// else
227-
new ConstantExpression(null, 0),
228-
0
229-
);
230-
}
209+
$conditional = new ConditionalTernary(
210+
// if
211+
new ConstantExpression(true, 0),
212+
// then
213+
new ConstantExpression(null, 0),
214+
// else
215+
new ConstantExpression(null, 0),
216+
0
217+
);
231218

232219
$arguments = new Nodes([new ContextVariable('form', 0), $conditional]);
233220

@@ -250,27 +237,15 @@ public function testCompileLabelWithLabelThatEvaluatesToNull()
250237

251238
public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
252239
{
253-
if (class_exists(ConditionalTernary::class)) {
254-
$conditional = new ConditionalTernary(
255-
// if
256-
new ConstantExpression(true, 0),
257-
// then
258-
new ConstantExpression(null, 0),
259-
// else
260-
new ConstantExpression(null, 0),
261-
0
262-
);
263-
} else {
264-
$conditional = new ConditionalExpression(
265-
// if
266-
new ConstantExpression(true, 0),
267-
// then
268-
new ConstantExpression(null, 0),
269-
// else
270-
new ConstantExpression(null, 0),
271-
0
272-
);
273-
}
240+
$conditional = new ConditionalTernary(
241+
// if
242+
new ConstantExpression(true, 0),
243+
// then
244+
new ConstantExpression(null, 0),
245+
// else
246+
new ConstantExpression(null, 0),
247+
0
248+
);
274249

275250
$arguments = new Nodes([
276251
new ContextVariable('form', 0),

‎src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Twig\Compiler;
1717
use Twig\Environment;
1818
use Twig\Loader\LoaderInterface;
19-
use Twig\Node\Expression\NameExpression;
2019
use Twig\Node\Expression\Variable\ContextVariable;
2120
use Twig\Node\TextNode;
2221

@@ -28,7 +27,7 @@ class TransNodeTest extends TestCase
2827
public function testCompileStrict()
2928
{
3029
$body = new TextNode('trans %var%', 0);
31-
$vars = class_exists(ContextVariable::class) ? new ContextVariable('foo', 0) : new NameExpression('foo', 0);
30+
$vars = new ContextVariable('foo', 0);
3231
$node = new TransNode($body, null, null, $vars);
3332

3433
$env = new Environment($this->createMock(LoaderInterface::class), ['strict_variables' => true]);

‎src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Twig\Node\Expression\ArrayExpression;
1919
use Twig\Node\Expression\ConstantExpression;
2020
use Twig\Node\Expression\FilterExpression;
21-
use Twig\Node\Expression\NameExpression;
2221
use Twig\Node\Expression\Variable\ContextVariable;
2322
use Twig\Node\Node;
2423
use Twig\Node\Nodes;
@@ -41,17 +40,10 @@ public function testMessageExtractionWithInvalidDomainNode()
4140
{
4241
$message = 'new key';
4342

44-
if (class_exists(Nodes::class)) {
45-
$n = new Nodes([
46-
new ArrayExpression([], 0),
47-
new ContextVariable('variable', 0),
48-
]);
49-
} else {
50-
$n = new Node([
51-
new ArrayExpression([], 0),
52-
new NameExpression('variable', 0),
53-
]);
54-
}
43+
$n = new Nodes([
44+
new ArrayExpression([], 0),
45+
new ContextVariable('variable', 0),
46+
]);
5547

5648
$node = new FilterExpression(
5749
new ConstantExpression($message, 0),

‎src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function parse(Token $token): Node
3939
}
4040
$this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
4141

42-
return new DumpNode(class_exists(LocalVariable::class) ? new LocalVariable(null, $token->getLine()) : $this->parser->getVarName(), $values, $token->getLine(), $this->getTag());
42+
return new DumpNode(new LocalVariable(null, $token->getLine()), $values, $token->getLine());
4343
}
4444

4545
private function parseMultitargetExpression(): Node

‎src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Twig\TokenParser;
1313

1414
use Symfony\Bridge\Twig\Node\StopwatchNode;
15-
use Twig\Node\Expression\AssignNameExpression;
1615
use Twig\Node\Expression\Variable\LocalVariable;
1716
use Twig\Node\Node;
1817
use Twig\Token;
@@ -45,7 +44,7 @@ public function parse(Token $token): Node
4544
$stream->expect(Token::BLOCK_END_TYPE);
4645

4746
if ($this->stopwatchIsAvailable) {
48-
return new StopwatchNode($name, $body, class_exists(LocalVariable::class) ? new LocalVariable(null, $token->getLine()) : new AssignNameExpression($this->parser->getVarName(), $token->getLine()), $lineno, $this->getTag());
47+
return new StopwatchNode($name, $body, new LocalVariable(null, $token->getLine()), $lineno);
4948
}
5049

5150
return $body;

‎src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function parse(Token $token): Node
2929

3030
$this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
3131

32-
return new TransDefaultDomainNode($expr, $token->getLine(), $this->getTag());
32+
return new TransDefaultDomainNode($expr, $token->getLine());
3333
}
3434

3535
public function getTag(): string

0 commit comments

Comments
 (0)