Inherit conditional returns

Fixes #3593
vimeo · Nov 9, 2023 · 9a32afd · 9a32afd
1 parent b775d29
commit 9a32afd
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 10 deletions.
diff --git a/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php b/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
@@ -577,23 +577,23 @@ public static function replaceTemplateTypes(
                 ) {
                     if ($template_type->param_name === 'TFunctionArgCount') {
                         $template_result->lower_bounds[$template_type->param_name] = [
-                            'fn-' . strtolower((string) $method_id) => [
+                            'fn-' . strtolower($method_id->method_name) => [
                                 new TemplateBound(
                                     Type::getInt(false, $arg_count),
                                 ),
                             ],
                         ];
                     } elseif ($template_type->param_name === 'TPhpMajorVersion') {
                         $template_result->lower_bounds[$template_type->param_name] = [
-                            'fn-' . strtolower((string) $method_id) => [
+                            'fn-' . strtolower($method_id->method_name) => [
                                 new TemplateBound(
                                     Type::getInt(false, $codebase->getMajorAnalysisPhpVersion()),
                                 ),
                             ],
                         ];
                     } elseif ($template_type->param_name === 'TPhpVersionId') {
                         $template_result->lower_bounds[$template_type->param_name] = [
-                            'fn-' . strtolower((string) $method_id) => [
+                            'fn-' . strtolower($method_id->method_name) => [
                                 new TemplateBound(
                                     Type::getInt(
                                         false,

diff --git a/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php b/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php
@@ -629,7 +629,7 @@ private static function resolveTemplateResultLowerBound(
     ): array {
         if ($template_type->param_name === 'TFunctionArgCount') {
             return [
-                'fn-' . strtolower((string)$method_id) => [
+                'fn-' . strtolower($method_id->method_name) => [
                     new TemplateBound(
                         Type::getInt(false, count($stmt->getArgs())),
                     ),
@@ -639,7 +639,7 @@ private static function resolveTemplateResultLowerBound(
 
         if ($template_type->param_name === 'TPhpMajorVersion') {
             return [
-                'fn-' . strtolower((string)$method_id) => [
+                'fn-' . strtolower($method_id->method_name) => [
                     new TemplateBound(
                         Type::getInt(false, $codebase->getMajorAnalysisPhpVersion()),
                     ),
@@ -649,7 +649,7 @@ private static function resolveTemplateResultLowerBound(
 
         if ($template_type->param_name === 'TPhpVersionId') {
             return [
-                'fn-' . strtolower((string) $method_id) => [
+                'fn-' . strtolower($method_id->method_name) => [
                     new TemplateBound(
                         Type::getInt(
                             false,

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
@@ -512,9 +512,8 @@ private static function getConditionalSanitizedTypeTokens(
 
             if ($token_body === 'func_num_args()') {
                 $template_name = 'TFunctionArgCount';
-
                 $storage->template_types[$template_name] = [
-                    $template_function_id => Type::getInt(),
+                    'fn-' . strtolower($storage->cased_name) => Type::getInt(),
                 ];
 
                 $function_template_types[$template_name]
@@ -527,7 +526,7 @@ private static function getConditionalSanitizedTypeTokens(
                 $template_name = 'TPhpMajorVersion';
 
                 $storage->template_types[$template_name] = [
-                    $template_function_id => Type::getInt(),
+                    'fn-' . strtolower($storage->cased_name) => Type::getInt(),
                 ];
 
                 $function_template_types[$template_name]
@@ -540,7 +539,7 @@ private static function getConditionalSanitizedTypeTokens(
                 $template_name = 'TPhpVersionId';
 
                 $storage->template_types[$template_name] = [
-                    $template_function_id => Type::getInt(),
+                    'fn-' . strtolower($storage->cased_name) => Type::getInt(),
                 ];
 
                 $function_template_types[$template_name]

diff --git a/tests/Template/ConditionalReturnTypeTest.php b/tests/Template/ConditionalReturnTypeTest.php
@@ -463,6 +463,31 @@ function zeroArgsFalseOneArgString(string $s = "") {
                     '$c' => 'string',
                 ],
             ],
+            'InheritFuncNumArgs' => [
+                'code' => '<?php
+                    abstract class A
+                    {
+                        /**
+                         * @psalm-return (func_num_args() is 1 ? string : int)
+                         */
+                        public static function get(bool $a, ?bool $b = null): int|string
+                        {
+                            if ($b) {
+                                return 1;
+                            }
+                            return "";
+                        }
+                    }
+
+                    class B extends A
+                    {
+
+                        public static function getB(bool $a): int
+                        {
+                            return self::get($a, true);
+                        }
+                    }',
+            ],
             'namespaceFuncNumArgs' => [
                 'code' => '<?php
                     namespace Foo;
@@ -887,6 +912,39 @@ function getSomethingElse()
                 'ignored_issues' => [],
                 'php_version' => '7.2',
             ],
+            'ineritedreturnTypeBasedOnPhpVersionId' => [
+                'code' => '<?php
+                    class A {
+                    /**
+                     * @psalm-return (PHP_VERSION_ID is int<70300, max> ? string : int)
+                     */
+                    function getSomething()
+                    {
+                        return mt_rand(1, 10) > 5 ? "a value" : 42;
+                    }
+
+                    /**
+                     * @psalm-return (PHP_VERSION_ID is int<70100, max> ? string : int)
+                     */
+                    function getSomethingElse()
+                    {
+                        return mt_rand(1, 10) > 5 ? "a value" : 42;
+                    }
+                    }
+
+                    class B extends A {}
+
+                    $class = new B();
+                    $something = $class->getSomething();
+                    $somethingElse = $class->getSomethingElse();
+                ',
+                'assertions' => [
+                    '$something' => 'int',
+                    '$somethingElse' => 'string',
+                ],
+                'ignored_issues' => [],
+                'php_version' => '7.2',
+            ],
             'ineritedConditionalTemplatedReturnType' => [
                 'code' => '<?php
                     /** @template InstanceType */