[DeadCode] Handle empty try and catch on RemoveDeadTryCatchRector (#1860)

Co-authored-by: GitHub Action <action@github.com>

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/Fixture/drop_with_empty_finally.php.inc

@@ -25,7 +25,6 @@ class DropWithEmptyFinally
 {
     public function run()
     {
-
     }
 }
 

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/Fixture/empty_try_and_catch.php.inc

@@ -0,0 +1,30 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector\Fixture;
+
+class EmptyTryAndCatch
+{
+    public function run()
+    {
+        try {
+            // some code
+        }
+        catch (Throwable $throwable) {
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector\Fixture;
+
+class EmptyTryAndCatch
+{
+    public function run()
+    {
+    }
+}
+
+?>

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/Fixture/fixture.php.inc

@@ -25,7 +25,6 @@ class Fixture
 {
     public function run()
     {
-
     }
 }
 

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/Fixture/multi_lines_different_throw_variable.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector\Fixture;
+
+class SkipMultiLinesDifferentThrowVariable
+{
+    public function run($variable)
+    {
+        try {
+            $this->doSomething();
+            $this->doSomethingElse();
+        }
+        catch (Throwable $throwable) {
+            throw $variable;
+        }
+    }
+}

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector/Fixture/skip_has_stmt_empty_catch_throw.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector\Fixture;
+
+class SkipHasStmtEmptyCatchThrow
+{
+    public function run()
+    {
+        try {
+            $this->call();
+        }
+        catch (Throwable $throwable) {
+        }
+    }
+}

rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php

@@ -6,7 +6,8 @@ namespace Rector\DeadCode\Rector\TryCatch;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\Catch_;
+use PhpParser\Node\Stmt\Finally_;
+use PhpParser\Node\Stmt\Nop;
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\Node\Stmt\TryCatch;
 use Rector\Core\Rector\AbstractRector;
@@ -42,7 +43,6 @@ class SomeClass
 {
     public function run()
     {
-        // some code
     }
 }
 CODE_SAMPLE
@@ -60,21 +60,28 @@ CODE_SAMPLE
 
     /**
      * @param TryCatch $node
-     * @return Stmt[]|null
+     * @return Stmt[]|null|TryCatch
      */
-    public function refactor(Node $node): ?array
+    public function refactor(Node $node): array|null|TryCatch
     {
+        $isEmptyFinallyStmts = ! $node->finally instanceof Finally_ || $this->isEmpty($node->finally->stmts);
+
+        // not empty stmts on finally always executed
+        if (! $isEmptyFinallyStmts) {
+            return null;
+        }
+
+        if ($this->isEmpty($node->stmts)) {
+            $this->removeNode($node);
+            return $node;
+        }
+
         if (count($node->catches) !== 1) {
             return null;
         }
 
-        /** @var Catch_ $onlyCatch */
         $onlyCatch = $node->catches[0];
-        if (count($onlyCatch->stmts) !== 1) {
-            return null;
-        }
-
-        if ($node->finally !== null && $node->finally->stmts !== []) {
+        if ($this->isEmpty($onlyCatch->stmts)) {
             return null;
         }
 
@@ -89,4 +96,20 @@ CODE_SAMPLE
 
         return $node->stmts;
     }
+
+    /**
+     * @param Stmt[] $stmts
+     */
+    private function isEmpty(array $stmts): bool
+    {
+        if ($stmts === []) {
+            return true;
+        }
+
+        if (count($stmts) > 1) {
+            return false;
+        }
+
+        return $stmts[0] instanceof Nop;
+    }
 }

scoper.php

@@ -138,15 +138,11 @@ return [
 
         // fixes https://github.com/rectorphp/rector/issues/7017
         function (string $filePath, string $prefix, string $content): string {
-            if (!str_ends_with($filePath, 'vendor/symfony/string/ByteString.php')) {
+            if (! str_ends_with($filePath, 'vendor/symfony/string/ByteString.php')) {
                 return $content;
             }
 
-            return Strings::replace(
-                $content,
-                '#' . $prefix . '\\\\\\\\1_\\\\\\\\2#',
-                '\\\\1_\\\\2'
-            );
+            return Strings::replace($content, '#' . $prefix . '\\\\\\\\1_\\\\\\\\2#', '\\\\1_\\\\2');
         },
 
         // unprefixed ContainerConfigurator