Move to PHPStan level 5

This commit is contained in:
Fabien Potencier
2026-02-07 08:50:23 +01:00
parent 825af0e7f1
commit b3cbcedced
10 changed files with 29 additions and 7 deletions
@@ -12,6 +12,7 @@
namespace Twig\ExpressionParser\Infix;
use Twig\Error\SyntaxError;
use Twig\Node\Expression\AbstractExpression;
use Twig\Node\Expression\ArrayExpression;
use Twig\Node\Expression\Binary\SetBinary;
use Twig\Node\Expression\Unary\SpreadUnary;
@@ -27,6 +28,7 @@ trait ArgumentsTrait
{
$arguments = new ArrayExpression([], $line);
foreach ($this->parseNamedArguments($parser, $parseOpenParenthesis) as $k => $n) {
/** @var AbstractExpression $n */
$arguments->addElement($n, new LocalVariable($k, $line));
}
@@ -20,6 +20,7 @@ use Twig\Node\EmptyNode;
use Twig\Node\Expression\AbstractExpression;
use Twig\Node\Expression\MacroReferenceExpression;
use Twig\Node\Expression\Variable\ContextVariable;
use Twig\Node\Expression\Variable\TemplateVariable;
use Twig\Parser;
use Twig\Token;
@@ -40,7 +41,10 @@ final class FunctionExpressionParser extends AbstractExpressionParser implements
$name = $expr->getAttribute('name');
if (null !== $alias = $parser->getImportedSymbol('function', $name)) {
return new MacroReferenceExpression($alias['node']->getNode('var'), $alias['name'], $this->parseCallableArguments($parser, $line, false), $line);
/** @var TemplateVariable $var */
$var = $alias['node']->getNode('var');
return new MacroReferenceExpression($var, $alias['name'], $this->parseCallableArguments($parser, $line, false), $line);
}
$args = $this->parseNamedArguments($parser, false);
@@ -19,6 +19,7 @@ use Twig\Node\Expression\AbstractExpression;
use Twig\Node\Expression\ArrayExpression;
use Twig\Node\Expression\MacroReferenceExpression;
use Twig\Node\Expression\Variable\ContextVariable;
use Twig\Node\Expression\Variable\TemplateVariable;
use Twig\Node\Nodes;
use Twig\Parser;
use Twig\Token;
@@ -43,7 +44,9 @@ class IsExpressionParser extends AbstractExpressionParser implements InfixExpres
}
if ('defined' === $test->getName() && $expr instanceof ContextVariable && null !== $alias = $parser->getImportedSymbol('function', $expr->getAttribute('name'))) {
$expr = new MacroReferenceExpression($alias['node']->getNode('var'), $alias['name'], new ArrayExpression([], $expr->getTemplateLine()), $expr->getTemplateLine());
/** @var TemplateVariable $var */
$var = $alias['node']->getNode('var');
$expr = new MacroReferenceExpression($var, $alias['name'], new ArrayExpression([], $expr->getTemplateLine()), $expr->getTemplateLine());
}
return new ($test->getNodeClass())($expr, $test, $arguments, $stream->getCurrent()->getLine());