[CodeQuality] Add ThrowWithPreviousExceptionRector

config/set/code-quality/code-quality.yaml

@@ -39,3 +39,4 @@ services:
     Rector\CodeQuality\Rector\FuncCall\IsAWithStringWithThirdArgumentRector: ~
     Rector\CodeQuality\Rector\FuncCall\StrlenZeroToIdenticalEmptyStringRector: ~
     Rector\CodeQuality\Rector\If_\RemoveAlwaysTrueConditionSetInConstructorRector: ~
+    Rector\CodeQuality\Rector\Catch_\ThrowWithPreviousExceptionRector: ~

packages/CodeQuality/src/Rector/Catch_/ThrowWithPreviousExceptionRector.php

@@ -0,0 +1,102 @@
+<?php declare(strict_types=1);
+
+namespace Rector\CodeQuality\Rector\Catch_;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Catch_;
+use PhpParser\NodeTraverser;
+use Rector\Rector\AbstractRector;
+use Rector\RectorDefinition\CodeSample;
+use Rector\RectorDefinition\RectorDefinition;
+
+/**
+ * @see https://github.com/thecodingmachine/phpstan-strict-rules/blob/e3d746a61d38993ca2bc2e2fcda7012150de120c/src/Rules/Exceptions/ThrowMustBundlePreviousExceptionRule.php#L83
+ * @see \Rector\CodeQuality\Tests\Rector\Catch_\ThrowWithPreviousExceptionRector\ThrowWithPreviousExceptionRectorTest
+ */
+final class ThrowWithPreviousExceptionRector extends AbstractRector
+{
+    public function getDefinition(): RectorDefinition
+    {
+        return new RectorDefinition(
+            'When throwing into a catch block, checks that the previous exception is passed to the new throw clause',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run()
+    {
+        try {
+            $someCode = 1;
+        } catch (Throwable $throwable) {
+            throw new AnotherException('ups');
+        }
+    }
+}
+CODE_SAMPLE
+                    ,
+                    <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run()
+    {
+        try {
+            $someCode = 1;
+        } catch (Throwable $throwable) {
+            throw new AnotherException('ups', $throwable->getCode(), $throwable);
+        }
+    }
+}
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [Catch_::class];
+    }
+
+    /**
+     * @param Catch_ $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $catchedThrowableVariable = $node->var;
+
+        $this->traverseNodesWithCallable($node->stmts, function (Node $node) use ($catchedThrowableVariable): ?int {
+            if (! $node instanceof Node\Stmt\Throw_) {
+                return null;
+            }
+
+            if (! $node->expr instanceof Node\Expr\New_) {
+                return null;
+            }
+
+            if (! $node->expr->class instanceof Node\Name) {
+                return null;
+            }
+
+            // exception is bundled
+            if (isset($node->expr->args[2])) {
+                return null;
+            }
+
+            if (! isset($node->expr->args[1])) {
+                // get previous code
+                $node->expr->args[1] = new Node\Arg(new Node\Expr\MethodCall($catchedThrowableVariable, 'getCode'));
+            }
+
+            $node->expr->args[2] = new Node\Arg($catchedThrowableVariable);
+
+            // nothing more to add
+            return NodeTraverser::STOP_TRAVERSAL;
+        });
+
+        return $node;
+    }
+}

packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/Fixture/fixture.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\CodeQuality\Tests\Rector\Catch_\ThrowWithPreviousExceptionRector\Fixture;
+
+class SomeClass
+{
+    public function run()
+    {
+        try {
+            $someCode = 1;
+        } catch (Throwable $throwable) {
+            throw new AnotherException('ups');
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodeQuality\Tests\Rector\Catch_\ThrowWithPreviousExceptionRector\Fixture;
+
+class SomeClass
+{
+    public function run()
+    {
+        try {
+            $someCode = 1;
+        } catch (Throwable $throwable) {
+            throw new AnotherException('ups', $throwable->getCode(), $throwable);
+        }
+    }
+}
+
+?>

packages/CodeQuality/tests/Rector/Catch_/ThrowWithPreviousExceptionRector/ThrowWithPreviousExceptionRectorTest.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Rector\CodeQuality\Tests\Rector\Catch_\ThrowWithPreviousExceptionRector;
+
+use Rector\CodeQuality\Rector\Catch_\ThrowWithPreviousExceptionRector;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class ThrowWithPreviousExceptionRectorTest extends AbstractRectorTestCase
+{
+    public function test(): void
+    {
+        $this->doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']);
+    }
+
+    protected function getRectorClass(): string
+    {
+        return ThrowWithPreviousExceptionRector::class;
+    }
+}