Skip to content

Commit

Permalink
bug symfony#58670 [TwigBridge] fix merge (xabbuh)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
xabbuh committed Oct 25, 2024
2 parents a543896 + 77c1080 commit 6d85dab
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/Symfony/Bridge/Twig/Node/StopwatchNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6d85dab

Please sign in to comment.