Merge pull request #7405 from klimick/fix-self-parsing-for-psalm-if-t…

…his-is Fix `self` parsing for `psalm-if-this-is` and `psalm-self-out`
vimeo · Jan 16, 2022 · a99c433 · a99c433
2 parents de824d6 + 10012c9
commit a99c433
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
@@ -303,7 +303,8 @@ function (FunctionLikeParameter $p): bool {
                     $docblock_info->self_out['type'],
                     $aliases,
                     $function_template_types + $class_template_types,
-                    $type_aliases
+                    $type_aliases,
+                    $classlike_storage ? $classlike_storage->name : null
                 ),
                 null,
                 $function_template_types + $class_template_types,
@@ -319,7 +320,8 @@ function (FunctionLikeParameter $p): bool {
                     $docblock_info->if_this_is['type'],
                     $aliases,
                     $function_template_types + $class_template_types,
-                    $type_aliases
+                    $type_aliases,
+                    $classlike_storage ? $classlike_storage->name : null
                 ),
                 null,
                 $function_template_types + $class_template_types,

diff --git a/tests/IfThisIsTest.php b/tests/IfThisIsTest.php
@@ -112,6 +112,28 @@ class F extends G
                 $f->test();
                 '
             ],
+            'ifThisIsWithSelfAlias' => [
+                '<?php
+                    /**
+                     * @template T of string
+                     */
+                    final class App
+                    {
+                        /**
+                         * @psalm-if-this-is self<"idle">
+                         * @psalm-this-out self<"started">
+                         */
+                        public function start(): void
+                        {
+                            throw new RuntimeException("???");
+                        }
+                    }
+
+                    /** @var App<"idle"> */
+                    $app = new App();
+                    $app->start();
+                '
+            ],
             'ifThisIsAndThisOutAtTheSameTime' => [
                 '<?php
                     /**