[TypeDeclaration] Skip possible void and return by docblock on ReturnTypeFromMockObjectRector

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromMockObjectRector/Fixture/skip_possible_void.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromMockObjectRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SkipPossibleVoid extends TestCase
+{
+    public function test()
+    {
+        if (rand(0, 1)) {
+            return $this->createMock('SomeType');
+        }
+    }
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromMockObjectRector/Fixture/skip_return_by_docblock.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromMockObjectRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+final class SkipReturnByDocblock extends TestCase
+{
+    public function test()
+    {
+        /** @var MockObject $x */
+        return $x;
+    }
+}

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromMockObjectRector.php

@@ -15,6 +15,7 @@
 use PHPStan\Type\Type;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractScopeAwareRector;
+use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -38,7 +39,8 @@ final class ReturnTypeFromMockObjectRector extends AbstractScopeAwareRector impl
 
     public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
-        private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard
+        private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard,
+        private readonly ReturnAnalyzer $returnAnalyzer
     ) {
     }
 
@@ -101,12 +103,14 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
-        $soleReturn = $returns[0];
-        if (! $soleReturn->expr instanceof Expr) {
+        if (! $this->returnAnalyzer->hasOnlyReturnWithExpr($node, $returns)) {
             return null;
         }
 
-        $returnType = $this->getType($soleReturn->expr);
+        /** @var Expr $expr */
+        $expr = $returns[0]->expr;
+        $returnType = $this->nodeTypeResolver->getNativeType($expr);
+
         if (! $this->isMockObjectType($returnType)) {
             return null;
         }