[TypeDeclaration] Allow abs() to return int when pass int arg on Ret…

…urnTypeFromStrictTypedCallRector (#5653) * [TypeDeclaration] Allow abs() to return int when pass int arg * [TypeDeclaration] Allow abs() to return int when pass int arg
rectorphp · Feb 21, 2024 · 6095e32 · 6095e32
1 parent 99a79f8
commit 6095e32
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/...ector/ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/abs_return_int.php.inc b/...ector/ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/abs_return_int.php.inc
@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector\Fixture;
+
+final class AbsReturnInt
+{
+    function aa(int $param)
+    {
+        return abs($param);
+    }
+}
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector\Fixture;
+
+final class AbsReturnInt
+{
+    function aa(int $param): int
+    {
+        return abs($param);
+    }
+}
+?>
diff --git a/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php
@@ -4,7 +4,6 @@
 
 namespace Rector\TypeDeclaration\TypeAnalyzer;
 
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
@@ -27,6 +26,8 @@
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Reflection\ReflectionResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -99,7 +100,16 @@ public function resolveMethodCallReturnNode(MethodCall | StaticCall | FuncCall $
             return null;
         }
 
-        $parametersAcceptorWithPhpDocs =  ParametersAcceptorSelector::combineAcceptors($methodReflection->getVariants());
+        $scope = $call->getAttribute(AttributeKey::SCOPE);
+        if (! $scope instanceof Scope) {
+            return null;
+        }
+
+        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelectorVariantsWrapper::select(
+            $methodReflection,
+            $call,
+            $scope
+        );
         if ($parametersAcceptorWithPhpDocs instanceof FunctionVariantWithPhpDocs) {
             // native return type is needed, as docblock can be false
             $returnType = $parametersAcceptorWithPhpDocs->getNativeReturnType();