Merge pull request #11836 from alies-dev/6.x-contrvariant-keyword-backport

[6.x] Ignore inline `covariant`/`contravariant` keywords in generic type parameters (backport)

Author: danog

src/Psalm/Internal/Type/ParseTreeCreator.php

@@ -145,6 +145,15 @@ public function create(): ParseTree
                     $this->handleIsOrAs($type_token);
                     break;
 
+                case 'covariant':
+                case 'contravariant':
+                    if ($this->t + 1 < $this->type_token_count
+                        && $this->type_tokens[$this->t + 1][0] === ' '
+                    ) {
+                        $this->t++;
+                    }
+                    break;
+
                 default:
                     $this->handleValue($type_token);
                     break;

src/Psalm/Internal/Type/TypeTokenizer.php

@@ -165,6 +165,10 @@ public static function tokenize(string $string_type, bool $ignore_space = true):
                 $type_tokens[++$rtc] = ['', ++$i];
                 $was_char = false;
                 continue;
+            } elseif ($was_space
+                && in_array($type_tokens[$rtc][0], ['covariant', 'contravariant'], true)
+            ) {
+                $type_tokens[++$rtc] = ['', $i];
             } elseif ($was_char) {
                 $type_tokens[++$rtc] = ['', $i];
             }
@@ -364,6 +368,7 @@ public static function getFullyQualifiedTokens(
                 $string_type_token[0],
                 [
                     '<', '>', '|', '?', ',', '{', '}', ':', '::', '[', ']', '(', ')', '&', '=', '...', 'as', 'is',
+                    'covariant', 'contravariant',
                 ],
                 true,
             )) {

tests/Template/ClassTemplateCovarianceTest.php

@@ -532,6 +532,37 @@ function run(Container $container): void{}
 
                     run(new Container(new TypeA()));',
             ],
+            'inlineCovariantModifierIgnored' => [
+                'code' => '<?php
+                    /**
+                     * @template-covariant T
+                     * @template TParent
+                     */
+                    class Container {}
+
+                    /**
+                     * @template T of object
+                     * @param class-string<T> $class
+                     * @return Container<covariant T, covariant string>
+                     */
+                    function wrap(string $class): Container
+                    {
+                        /** @var Container<covariant T, covariant string> */
+                        return new Container();
+                    }',
+            ],
+            'inlineContravariantModifierIgnored' => [
+                'code' => '<?php
+                    /**
+                     * @template T
+                     */
+                    class Box {}
+
+                    /**
+                     * @param Box<contravariant string> $box
+                     */
+                    function consume(Box $box): void {}',
+            ],
         ];
     }
 

tests/TypeParseTest.php

@@ -191,6 +191,26 @@ public function testGeneric(): void
         $this->assertSame('B<int>', (string) Type::parseString('B<int>'));
     }
 
+    public function testGenericWithInlineCovariant(): void
+    {
+        $this->assertSame('B<int>', (string) Type::parseString('B<covariant int>'));
+    }
+
+    public function testGenericWithInlineContravariant(): void
+    {
+        $this->assertSame('B<int>', (string) Type::parseString('B<contravariant int>'));
+    }
+
+    public function testGenericWithMultipleInlineVariance(): void
+    {
+        $this->assertSame('B<int, string>', (string) Type::parseString('B<covariant int, contravariant string>'));
+    }
+
+    public function testGenericWithInlineVarianceAndUnion(): void
+    {
+        $this->assertSame('B<int|string>', (string) Type::parseString('B<covariant int|string>'));
+    }
+
     public function testIntersection(): void
     {
         $this->assertSame('I1&I2&I3', (string) Type::parseString('I1&I2&I3'));