Merge pull request #6503 from orklah/TClassString_inference

vimeo · Sep 17, 2021 · 37362b3 · 37362b3
2 parents e4c6f97 + e9f3d5b
commit 37362b3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -1173,6 +1173,8 @@ protected static function getInstanceOfTypes(
                         $literal_class_strings[] = $atomic_type->value;
                     } elseif ($atomic_type instanceof Type\Atomic\TTemplateParamClass) {
                         $literal_class_strings[] = $atomic_type->param_name;
+                    } elseif ($atomic_type instanceof Type\Atomic\TClassString && $atomic_type->as !== 'object') {
+                        $literal_class_strings[] = $atomic_type->as;
                     }
                 }
 

diff --git a/tests/ClassLikeStringTest.php b/tests/ClassLikeStringTest.php
@@ -458,6 +458,23 @@ function f(Exception $e): ?InvalidArgumentException {
                         }
                     }',
             ],
+            'instanceofClassStringNotLiteral' => [
+                '<?php
+                    final class Z {
+                    /**
+                     * @psalm-var class-string<stdClass> $class
+                     */
+                    private string $class = stdClass::class;
+
+                    public function go(object $object): ?stdClass {
+                        $a = $this->class;
+                        if ($object instanceof $a) {
+                            return $object;
+                        }
+                        return null;
+                    }
+                }'
+            ],
             'returnTemplatedClassString' => [
                 '<?php
                     /**