Merge pull request #10625 from weirdan/allow-typedef-imports-from-any…

…-kind-of-classlike
vimeo · Feb 1, 2024 · 38d7d43 · 38d7d43
2 parents 0082207 + 6140f68
commit 38d7d43
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FileAnalyzer.php b/src/Psalm/Internal/Analyzer/FileAnalyzer.php
@@ -237,7 +237,7 @@ public function analyze(
                         $this->suppressed_issues,
                         new ClassLikeNameOptions(
                             true,
-                            false,
+                            true,
                             true,
                             true,
                             true,

diff --git a/src/Psalm/Internal/Type/TypeExpander.php b/src/Psalm/Internal/Type/TypeExpander.php
@@ -283,7 +283,9 @@ public static function expandAtomic(
                 $declaring_fq_classlike_name = $self_class;
             }
 
-            if (!($evaluate_class_constants && $codebase->classOrInterfaceOrEnumExists($declaring_fq_classlike_name))) {
+            if (!($evaluate_class_constants
+                && $codebase->classlikes->doesClassLikeExist(strtolower($declaring_fq_classlike_name))
+            )) {
                 return [$return_type];
             }
 

diff --git a/tests/TypeAnnotationTest.php b/tests/TypeAnnotationTest.php
@@ -884,6 +884,21 @@ public function f(array $foo): void {
                 'ignored_issues' => [],
                 'php_version' => '8.1',
             ],
+            'importFromTrait' => [
+                'code' => <<<'PHP'
+                <?php
+                /** @psalm-type _Foo = array{foo: string} */
+                trait T {}
+
+                /** @psalm-import-type _Foo from T */
+                class C {
+                    /** @param _Foo $foo */
+                    public function f(array $foo): void {
+                        echo $foo['foo'];
+                    }
+                }
+                PHP,
+            ],
             'inlineComments' => [
                 'code' => <<<'PHP'
                     <?php