mirror of
https://github.com/twigphp/Twig.git
synced 2026-08-24 15:06:26 +00:00
fix the handling of predefined arguments in CallExpression
This commit is contained in:
committed by
GitHub
parent
70886ec75e
commit
37fa03681e
@@ -334,7 +334,7 @@ abstract class CallExpression extends AbstractExpression
|
||||
[
|
||||
'is_variadic' => $this->hasAttribute('is_variadic') ? $this->getAttribute('is_variadic') : $current->isVariadic(),
|
||||
],
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ?: $current->getArguments()),
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ? $this->getAttribute('arguments') : $current->getArguments()),
|
||||
'function' => (new TwigFunction(
|
||||
$this->hasAttribute('name') ? $this->getAttribute('name') : $current->getName(),
|
||||
$this->hasAttribute('callable') ? $this->getAttribute('callable') : $current->getCallable(),
|
||||
@@ -344,7 +344,7 @@ abstract class CallExpression extends AbstractExpression
|
||||
'needs_charset' => $this->hasAttribute('needs_charset') ? $this->getAttribute('needs_charset') : $current->needsCharset(),
|
||||
'is_variadic' => $this->hasAttribute('is_variadic') ? $this->getAttribute('is_variadic') : $current->isVariadic(),
|
||||
],
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ?: $current->getArguments()),
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ? $this->getAttribute('arguments') : $current->getArguments()),
|
||||
'filter' => (new TwigFilter(
|
||||
$this->getAttribute('name'),
|
||||
$this->hasAttribute('callable') ? $this->getAttribute('callable') : $current->getCallable(),
|
||||
@@ -354,7 +354,7 @@ abstract class CallExpression extends AbstractExpression
|
||||
'needs_charset' => $this->hasAttribute('needs_charset') ? $this->getAttribute('needs_charset') : $current->needsCharset(),
|
||||
'is_variadic' => $this->hasAttribute('is_variadic') ? $this->getAttribute('is_variadic') : $current->isVariadic(),
|
||||
],
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ?: $current->getArguments()),
|
||||
))->withDynamicArguments($this->getAttribute('name'), $this->hasAttribute('dynamic_name') ? $this->getAttribute('dynamic_name') : $current->getDynamicName(), $this->hasAttribute('arguments') ? $this->getAttribute('arguments') : $current->getArguments()),
|
||||
});
|
||||
|
||||
return $this->getAttribute('twig_callable');
|
||||
|
||||
Reference in New Issue
Block a user