Add edge cases to skip (#2604)

rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+function selfsubstr(): string
+{
+    return 'hi';
+}
+
+final class SkipEmptyReturn
+{
+    public function run($value)
+    {
+        if ($value) {
+            return true;
+        }
+
+        return selfsubstr('warning', 1);
+    }
+}

rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class SkipEmptyReturn
+{
+    public function run($value)
+    {
+        if ($value) {
+            return;
+        }
+
+        return substr('warning', 1);
+    }
+}

rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php

@@ -86,6 +86,9 @@ public function refactor(Node $node): ?Node
         }
 
         $returnTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($scalarReturnType, TypeKind::RETURN);
+        if (! $returnTypeNode instanceof Node) {
+            return null;
+        }
 
         $node->returnType = $returnTypeNode;
         return $node;

rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php

@@ -50,14 +50,8 @@ public function matchStrictScalarExpr(Expr $expr): ?Type
             return null;
         }
 
-        if ($expr instanceof FuncCall && $expr->name instanceof Name) {
-            $functionReflection = $this->reflectionProvider->getFunction($expr->name, null);
-            if (! $functionReflection instanceof NativeFunctionReflection) {
-                return null;
-            }
-
-            $parametersAcceptor = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants());
-            return $parametersAcceptor->getReturnType();
+        if ($expr instanceof FuncCall) {
+            return $this->resolveFuncCallType($expr);
         }
 
         return null;
@@ -87,4 +81,23 @@ private function resolveTypeFromScalar(Scalar $scalar): Type|null
 
         return null;
     }
+
+    private function resolveFuncCallType(FuncCall $funcCall): ?Type
+    {
+        if (! $funcCall->name instanceof Name) {
+            return null;
+        }
+
+        if (! $this->reflectionProvider->hasFunction($funcCall->name, null)) {
+            return null;
+        }
+
+        $functionReflection = $this->reflectionProvider->getFunction($funcCall->name, null);
+        if (! $functionReflection instanceof NativeFunctionReflection) {
+            return null;
+        }
+
+        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants());
+        return $parametersAcceptor->getReturnType();
+    }
 }