Merge pull request #10362 from robchett/type_aliases_for_static_state…

…ment_vars Allow type aliases for static variables
vimeo · Nov 13, 2023 · 5de8390 · 5de8390
2 parents b775d29 + 70075e7
commit 5de8390
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/CommentAnalyzer.php b/src/Psalm/Internal/Analyzer/CommentAnalyzer.php
@@ -432,6 +432,10 @@ public static function getVarComments(
         $var_comments = [];
 
         try {
+            $file_path = $statements_analyzer->getRootFilePath();
+            $file_storage_provider = $codebase->file_storage_provider;
+            $file_storage = $file_storage_provider->get($file_path);
+
             $var_comments = $codebase->config->disable_var_parsing
                 ? []
                 : self::arrayToDocblocks(
@@ -440,6 +444,7 @@ public static function getVarComments(
                     $statements_analyzer->getSource(),
                     $statements_analyzer->getSource()->getAliases(),
                     $statements_analyzer->getSource()->getTemplateTypeMap(),
+                    $file_storage->type_aliases,
                 );
         } catch (IncorrectDocblockException $e) {
             IssueBuffer::maybeAdd(

diff --git a/tests/AnnotationTest.php b/tests/AnnotationTest.php
@@ -1013,6 +1013,21 @@ function getPerson_error(): array {
                         return json_decode($json, true);
                     }',
             ],
+            'psalmTypeAnnotationForStaticVar' => [
+                'code' => '<?php
+                    /**
+                     * @psalm-type _Type A::TYPE_*
+                     */
+                    class A{
+                        const TYPE_A = 1;
+                        const TYPE_B = 2;
+
+                        public function f(): void {
+                            /** @psalm-var _Type $var*/
+                            static $var;
+                        }
+                    }',
+            ],
             'allowDocblockDefinedTKeyedArrayIntoNonEmpty' => [
                 'code' => '<?php
                     /** @param non-empty-array $_bar */