Around PHPStan 1.12.4 handling on ParametersAcceptors with non-native…

… return type (by docblock) (#6341)
rectorphp · Oct 1, 2024 · 697b37b · 697b37b
1 parent a11fc61
commit 697b37b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -53,6 +53,10 @@ parameters:
             message: '#Function "var_dump\(\)" cannot be used/left in the code#'
             path: src/functions/node_helper.php
 
+        -
+            message: '#Function "method_exists\(\)" cannot be used/left in the code#'
+            path: rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php
+
         # lack of generic array in nikic/php-parser
         - '#Method (.*?) should return array<PhpParser\\Node\\(.*?)\> but returns array<PhpParser\\Node\>#'
 

diff --git a/...ethod/ReturnTypeFromStrictTypedCallRector/Fixture/skip_external_caller_return_doc.php.inc b/...ethod/ReturnTypeFromStrictTypedCallRector/Fixture/skip_external_caller_return_doc.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector\Source\SomeExternalCaller;
+
+final class SkipExternalCallerReturnDoc
+{
+    public function getData(SomeExternalCaller $someExternalCaller, $x)
+    {
+        return $someExternalCaller->getData($x);
+    }
+}
diff --git a/...tion/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/Source/SomeExternalCaller.php b/...tion/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector/Source/SomeExternalCaller.php
@@ -10,4 +10,12 @@ public function getName(): string
     {
         return 'Yesman';
     }
+
+    /**
+     * @return string
+     */
+    public function getData($data)
+    {
+        return $data;
+    }
 }
diff --git a/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php
@@ -125,6 +125,14 @@ public function resolveMethodCallReturnType(MethodCall | StaticCall | FuncCall $
             $returnType = $parametersAcceptorWithPhpDocs->getNativeReturnType();
         } else {
             $returnType = $parametersAcceptorWithPhpDocs->getReturnType();
+
+            // around PHPStan 1.12.4+ handling
+            if (method_exists($parametersAcceptorWithPhpDocs, 'getNativeReturnType')) {
+                $nativeReturnType = $parametersAcceptorWithPhpDocs->getNativeReturnType();
+                if ($nativeReturnType instanceof MixedType && ! $nativeReturnType->isExplicitMixed()) {
+                    $returnType = $nativeReturnType;
+                }
+            }
         }
 
         if ($returnType instanceof MixedType) {