bug symfony#58670 [TwigBridge] fix merge (xabbuh)

xabbuh · xabbuh · commit 6d85dab2b540 · 2024-10-25T18:12:43.000+02:00
This PR was merged into the 7.2 branch. Discussion ---------- [TwigBridge] fix merge | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 77c1080 fix merge
diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@@ -27,11 +27,7 @@ final class StopwatchNode extends Node
 {
     public function __construct(Node $name, Node $body, AssignNameExpression|LocalVariable $var, int $lineno = 0)
     {
-        if (class_exists(FirstClassTwigCallableReady::class)) {
-            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);
-        } else {
-            parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
-        }
+        parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);
     }
 
     public function compile(Compiler $compiler): void

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,7 @@ final class StopwatchNode extends Node`
`27`	`27`	`{`
`28`	`28`	`public function __construct(Node $name, Node $body, AssignNameExpression\|LocalVariable $var, int $lineno = 0)`
`29`	`29`	`{`
`30`		`- if (class_exists(FirstClassTwigCallableReady::class)) {`
`31`		`- parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);`
`32`		`- } else {`
`33`		`- parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);`
`34`		`- }`
	`30`	`+ parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno);`
`35`	`31`	`}`
`36`	`32`
`37`	`33`	`public function compile(Compiler $compiler): void`