Fix PHPStan for Twig 4.x

[VincentLanglet]

Hi @fabpot, to help introducing PHPStan on 4.x, I made the merge 3.x into 4.x

• Fixing the conflits
• Fixing PHPStan build

I have

• A commit with the merge 6a82e16

• A commit with the update needed to get PHPStan build green in 4.x cb89b75

[fabpot]

@VincentLanglet I've just merged 3.x into 4.x to keep this PR only about phpstan.

[fabpot]

These 2 changes look wrong to me.

[VincentLanglet]

Those values are set in construct

 $this->unaryOperators = $env->getUnaryOperators();
$this->binaryOperators = $env->getBinaryOperators();

They call the method on $this->extensionSet.
The ExtensionSet gets them from multiple ExtensionInterface,
and getOperators is

/**
     * Returns a list of operators to add to the existing list.
     *
     * @return array<array> First array of unary operators, second array of binary operators
     *
     * @psalm-return array{
     *     array<string, array{precedence: int, precedence_change?: OperatorPrecedenceChange, class: class-string<AbstractExpression>}>,
     *     array<string, array{precedence: int, precedence_change?: OperatorPrecedenceChange, class?: class-string<AbstractExpression>, associativity: ExpressionParser::OPERATOR_*}>
     * }
     */
    public function getOperators(): array;

This is because

'??' => ['precedence' => 5, 'class' => NullCoalesceExpression::class, 'associativity' => ExpressionParser::OPERATOR_RIGHT],

is not an AbstractBinary but just an AbtractExpression.

[fabpot]

Indeed. I suppose all binary operators should extend AbstractBinary. I'm going to have a look at it.

[VincentLanglet]

Indeed. I suppose all binary operators should extend AbstractBinary. I'm going to have a look at it.

The issue already exists on 3.x if you want to take a look and fix it on the lower branch.
You can ping me after the fix, I'll update the PHPDoc if needed :)

[VincentLanglet]

Can you add a test that would break without this change?

For the iterable/Iterator issue, I think it's an issue with PHPStan instead.
So I created an issue on phpstan/phpstan#12102 (and a fix on phpstan side)

[fabpot]

Can you add a test that would break without this change?

For the iterable/Iterator issue, I think it's an issue with PHPStan instead. So I created an issue on phpstan/phpstan#12102 (and a fix on phpstan side)

Let's revert the change then.

[VincentLanglet]

Can you add a test that would break without this change?

For the iterable/Iterator issue, I think it's an issue with PHPStan instead. So I created an issue on phpstan/phpstan#12102 (and a fix on phpstan side)

Let's revert the change then.

I reverted the extra if I added.

We still need /** @var \Iterator<TKey, TValue> $seq */ to not lose the template type.