Updated Rector to commit a5395fc2837b19a76f9f98b4c5915341164afdac

rectorphp/rector-src@a5395fc [Php80] Prevent adding empty return when stringable always throws (#6968)

Author: TomasVotruba

rules/Php80/Rector/Class_/StringableForToStringRector.php

@@ -12,11 +12,13 @@
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Expression;
 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;
@@ -46,17 +48,22 @@ final class StringableForToStringRector extends AbstractRector implements MinPhp
      * @readonly
      */
     private BetterNodeFinder $betterNodeFinder;
+    /**
+     * @readonly
+     */
+    private TerminatedNodeAnalyzer $terminatedNodeAnalyzer;
     /**
      * @var string
      */
     private const STRINGABLE = 'Stringable';
     private bool $hasChanged = \false;
-    public function __construct(FamilyRelationsAnalyzer $familyRelationsAnalyzer, ReturnTypeInferer $returnTypeInferer, ClassAnalyzer $classAnalyzer, BetterNodeFinder $betterNodeFinder)
+    public function __construct(FamilyRelationsAnalyzer $familyRelationsAnalyzer, ReturnTypeInferer $returnTypeInferer, ClassAnalyzer $classAnalyzer, BetterNodeFinder $betterNodeFinder, TerminatedNodeAnalyzer $terminatedNodeAnalyzer)
     {
         $this->familyRelationsAnalyzer = $familyRelationsAnalyzer;
         $this->returnTypeInferer = $returnTypeInferer;
         $this->classAnalyzer = $classAnalyzer;
         $this->betterNodeFinder = $betterNodeFinder;
+        $this->terminatedNodeAnalyzer = $terminatedNodeAnalyzer;
     }
     public function provideMinPhpVersion() : int
     {
@@ -135,6 +142,10 @@ private function processNotStringType(ClassMethod $toStringClassMethod) : void
         $hasReturn = $this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($toStringClassMethod, Return_::class);
         if (!$hasReturn) {
             $emptyStringReturn = new Return_(new String_(''));
+            $lastStmt = $toStringClassMethod->stmts[\count($toStringClassMethod->stmts) - 1] ?? null;
+            if ($lastStmt instanceof Expression && $this->terminatedNodeAnalyzer->isAlwaysTerminated($toStringClassMethod, $lastStmt, $emptyStringReturn)) {
+                return;
+            }
             $toStringClassMethod->stmts[] = $emptyStringReturn;
             $this->hasChanged = \true;
             return;

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'c2588bb049fd6eb4587f47e00bd269216fba0463';
+    public const PACKAGE_VERSION = 'a5395fc2837b19a76f9f98b4c5915341164afdac';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-09 11:26:53';
+    public const RELEASE_DATE = '2025-06-09 20:46:01';
     /**
      * @var int
      */

src/NodeAnalyzer/TerminatedNodeAnalyzer.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Continue_;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\Expression;
@@ -40,7 +41,10 @@ final class TerminatedNodeAnalyzer
      * @var array<class-string<Node>>
      */
     private const ALLOWED_CONTINUE_CURRENT_STMTS = [InlineHTML::class, Nop::class];
-    public function isAlwaysTerminated(StmtsAwareInterface $stmtsAware, Stmt $node, Stmt $currentStmt) : bool
+    /**
+     * @param \Rector\Contract\PhpParser\Node\StmtsAwareInterface|\PhpParser\Node\Stmt\ClassMethod $stmtsAware
+     */
+    public function isAlwaysTerminated($stmtsAware, Stmt $node, Stmt $currentStmt) : bool
     {
         if (\in_array(\get_class($currentStmt), self::ALLOWED_CONTINUE_CURRENT_STMTS, \true)) {
             return \false;