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.

[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.

[VincentLanglet]

I rebased @fabpot

[fabpot]

Thank you @VincentLanglet.