Fix #5279 - don’t convert get_class($templated) into dependent type

vimeo · Feb 25, 2021 · d484199 · d484199
1 parent b2c3583
commit d484199
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
@@ -422,22 +422,28 @@ private static function handleDependentTypeFunction(
                 $var_id = '$' . $var->name;
 
                 if (isset($context->vars_in_scope[$var_id])) {
-                    if ($function_id === 'get_class') {
-                        $atomic_type = new Type\Atomic\TDependentGetClass(
-                            $var_id,
-                            $context->vars_in_scope[$var_id]->hasMixed()
-                                ? Type::getObject()
-                                : $context->vars_in_scope[$var_id]
-                        );
-                    } elseif ($function_id === 'gettype') {
-                        $atomic_type = new Type\Atomic\TDependentGetType($var_id);
-                    } else {
-                        $atomic_type = new Type\Atomic\TDependentGetDebugType($var_id);
-                    }
+                    if (!$context->vars_in_scope[$var_id]->hasTemplate()) {
+                        if ($function_id === 'get_class') {
+                            $atomic_type = new Type\Atomic\TDependentGetClass(
+                                $var_id,
+                                $context->vars_in_scope[$var_id]->hasMixed()
+                                    ? Type::getObject()
+                                    : $context->vars_in_scope[$var_id]
+                            );
+                        } elseif ($function_id === 'gettype') {
+                            $atomic_type = new Type\Atomic\TDependentGetType($var_id);
+                        } else {
+                            $atomic_type = new Type\Atomic\TDependentGetDebugType($var_id);
+                        }
+
+                        $statements_analyzer->node_data->setType($real_stmt, new Type\Union([$atomic_type]));
 
-                    $statements_analyzer->node_data->setType($real_stmt, new Type\Union([$atomic_type]));
+                        return;
+                    }
                 }
-            } elseif (($var_type = $statements_analyzer->node_data->getType($var))
+            }
+
+            if (($var_type = $statements_analyzer->node_data->getType($var))
                 && ($function_id === 'get_class'
                     || $function_id === 'get_debug_type'
                 )

diff --git a/tests/Template/FunctionTemplateTest.php b/tests/Template/FunctionTemplateTest.php
@@ -1529,6 +1529,26 @@ function toList(array $arr): array {
                         return reset($arr);
                     }'
             ],
+            'callTemplatedFunctionWithTemplatedClassString' => [
+                '<?php
+                    /**
+                     * @template Ta of object
+                     * @psalm-param Ta $obj
+                     * @return Ta
+                     */
+                    function a(string $str, object $obj) {
+                        $class = get_class($obj);
+                        return deserialize_object($str, $class);
+                    }
+
+                    /**
+                     * @psalm-template Tb
+                     * @psalm-param class-string<Tb> $type
+                     * @psalm-return Tb
+                     * @psalm-suppress InvalidReturnType
+                     */
+                    function deserialize_object(string $data, string $type) {}'
+            ],
         ];
     }