[Php80] Handle has silent void on StringableForToStringRector (#6970)

* [Php80] Handle has silent void on StringableForToStringRector

* s

* clean up

* more fixture

Author: samsonasik

rules-tests/Php80/Rector/Class_/StringableForToStringRector/Fixture/possible_void.php.inc

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\StringableForToStringRector\Fixture;
+
+class PossibleVoid
+{
+    public function __toString()
+    {
+        if (rand(0, 1)) {
+            return 'something';
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\StringableForToStringRector\Fixture;
+
+class PossibleVoid implements \Stringable
+{
+    public function __toString(): string
+    {
+        if (rand(0, 1)) {
+            return 'something';
+        }
+        return '';
+    }
+}
+
+?>

rules-tests/Php80/Rector/Class_/StringableForToStringRector/Fixture/possible_void2.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\StringableForToStringRector\Fixture;
+
+class PossibleVoid2
+{
+    public function __toString()
+    {
+        if (rand(0, 1)) {
+            return;
+        }
+        return 'something';
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php80\Rector\Class_\StringableForToStringRector\Fixture;
+
+class PossibleVoid2 implements \Stringable
+{
+    public function __toString(): string
+    {
+        if (rand(0, 1)) {
+            return '';
+        }
+        return 'something';
+    }
+}
+
+?>

rules/Php80/Rector/Class_/StringableForToStringRector.php

@@ -11,18 +11,16 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\NodeVisitor;
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
 use Rector\NodeAnalyzer\ClassAnalyzer;
-use Rector\NodeAnalyzer\TerminatedNodeAnalyzer;
-use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
+use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver;
 use Rector\ValueObject\MethodName;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -45,8 +43,7 @@ public function __construct(
         private readonly FamilyRelationsAnalyzer $familyRelationsAnalyzer,
         private readonly ReturnTypeInferer $returnTypeInferer,
         private readonly ClassAnalyzer $classAnalyzer,
-        private readonly BetterNodeFinder $betterNodeFinder,
-        private readonly TerminatedNodeAnalyzer $terminatedNodeAnalyzer
+        private readonly SilentVoidResolver $silentVoidResolver
     ) {
     }
 
@@ -145,16 +142,8 @@ private function processNotStringType(ClassMethod $toStringClassMethod): void
             return;
         }
 
-        $hasReturn = $this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($toStringClassMethod, Return_::class);
-        if (! $hasReturn) {
+        if ($this->silentVoidResolver->hasSilentVoid($toStringClassMethod)) {
             $emptyStringReturn = new Return_(new String_(''));
-
-            $lastStmt = $toStringClassMethod->stmts[count($toStringClassMethod->stmts) - 1] ?? null;
-
-            if ($lastStmt instanceof Stmt && $this->terminatedNodeAnalyzer->isAlwaysTerminated($toStringClassMethod, $lastStmt, $emptyStringReturn)) {
-                return;
-            }
-
             $toStringClassMethod->stmts[] = $emptyStringReturn;
 
             $this->hasChanged = true;