Merge pull request #8708 from annervisser/allow-using-imported-type-i…

…n-other-type Allow using imported types in other types within the same file
vimeo · Nov 18, 2022 · 48c0df6 · 48c0df6
2 parents ebc7599 + d10b1f9
commit 48c0df6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -32,6 +32,7 @@
 use Psalm\Type;
 use UnexpectedValueException;
 
+use function array_merge;
 use function array_pop;
 use function end;
 use function explode;
@@ -187,7 +188,7 @@ public function enterNode(PhpParser\Node $node): ?int
                 return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
             }
 
-            $this->type_aliases += $classlike_node_scanner->type_aliases;
+            $this->type_aliases = array_merge($this->type_aliases, $classlike_node_scanner->type_aliases);
         } elseif ($node instanceof PhpParser\Node\Stmt\TryCatch) {
             foreach ($node->catches as $catch) {
                 foreach ($catch->types as $catch_type) {

diff --git a/tests/TypeAnnotationTest.php b/tests/TypeAnnotationTest.php
@@ -629,6 +629,32 @@ private function assertFoo($value): void {
                 'assertions' => [
                     '$output' => 'string',
                 ]
+            ],
+            'importedTypeUsedInOtherType' => [
+                'code' => '<?php
+                    /** @psalm-type OpeningTypes=self::TYPE_A|self::TYPE_B */
+                    class Foo {
+                        public const TYPE_A = 1;
+                        public const TYPE_B = 2;
+                    }
+
+                    /**
+                     * @psalm-import-type OpeningTypes from Foo
+                     * @psalm-type OpeningTypeAssignment=list<OpeningTypes>
+                     */
+                    class Main {
+                        /** @return OpeningTypeAssignment */
+                        public function doStuff(): array {
+                            return [];
+                        }
+                    }
+
+                    $instance = new Main();
+                    $output = $instance->doStuff();
+                ',
+                'assertions' => [
+                    '$output===' => 'list<1|2>',
+                ]
             ]
         ];
     }