Merge pull request #10617 from weirdan/10416-import-typedefs-from-enums

vimeo · Jan 30, 2024 · 35e6eff · 35e6eff
2 parents baa8660 + 6d32d2f
commit 35e6eff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/TypeExpander.php b/src/Psalm/Internal/Type/TypeExpander.php
@@ -283,7 +283,7 @@ public static function expandAtomic(
                 $declaring_fq_classlike_name = $self_class;
             }
 
-            if (!($evaluate_class_constants && $codebase->classOrInterfaceExists($declaring_fq_classlike_name))) {
+            if (!($evaluate_class_constants && $codebase->classOrInterfaceOrEnumExists($declaring_fq_classlike_name))) {
                 return [$return_type];
             }
 

diff --git a/tests/TypeAnnotationTest.php b/tests/TypeAnnotationTest.php
@@ -865,6 +865,25 @@ public function doesNotWork($_doesNotWork): void {
                         }
                     }',
             ],
+            'importFromEnum' => [
+                'code' => <<<'PHP'
+                <?php
+                /** @psalm-type _Foo = array{foo: string} */
+                enum E {}
+                /**
+                 * @psalm-import-type _Foo from E
+                 */
+                class C {
+                    /** @param _Foo $foo */
+                    public function f(array $foo): void {
+                        echo $foo['foo'];
+                    }
+                }
+                PHP,
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.1',
+            ],
         ];
     }