Merge branch '3326359-fix-phpstan-l2' into '11.x'

Issue #3326359: Fix PHPStan L2 error "Binary operation "[something]" between Foo and Bar results in an error."

See merge request !3098