[DeadCode] Add RemoveDeadCatchRector rule by P3gucka · Pull Request #6939 · rectorphp/rector-src

P3gucka · 2025-05-28T11:50:40Z

No description provided.

src/Config/Level/DeadCodeLevel.php

rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php

rules-tests/DeadCode/Rector/TryCatch/RemoveDeadCatchRector/Fixture/drop_with_finally.php.inc

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

rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php

samsonasik · 2025-06-02T00:01:47Z

Okay, let's give it a try, thank you @P3gucka

samsonasik · 2025-06-02T00:11:26Z

@P3gucka I tested in this rector-src code base, it seems it cause invalid change:

2) src/Application/FileProcessor.php:10

    ---------- begin diff ----------
@@ @@
 use Rector\Caching\Detector\ChangedFilesDetector;
 use Rector\ChangesReporting\ValueObjectFactory\ErrorFactory;
 use Rector\ChangesReporting\ValueObjectFactory\FileDiffFactory;
-use Rector\Exception\ShouldNotHappenException;
 use Rector\FileSystem\FilePathHelper;
 use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
 use Rector\PhpParser\NodeTraverser\RectorNodeTraverser;
@@ @@
             } catch (ParserErrorsException) {
                 $this->parseFileNodes($file, false);
             }
-        } catch (ShouldNotHappenException $shouldNotHappenException) {
-            throw $shouldNotHappenException;
        } catch (AnalysedCodeException $analysedCodeException) {
            // inform about missing classes in tests
            if (StaticPHPUnitEnvironment::isPHPUnitRun()) {
                throw $analysedCodeException;
            }

            return $this->errorFactory->createAutoloadError($analysedCodeException, $file->getFilePath());
        } catch (Throwable $throwable) {
            if ($this->symfonyStyle->isVerbose() || StaticPHPUnitEnvironment::isPHPUnitRun()) {
                throw $throwable;
            }
    ----------- end diff -----------

Applied rules:
 * RemoveDeadCatchRector

which if next catch has handled Throwable, it should be skipped, as children class executed early just throw if next Exception/Throwable is its super class.

I will look into it.

samsonasik · 2025-06-02T00:16:53Z

Here the code to skip:

use Rector\Exception\ShouldNotHappenException;
use Throwable;

class SkipNextThrowableHasSpecialCondition
{
    public function run()
    {
        try {
            // some code
        } catch (ShouldNotHappenException $exception) { // on child, specifically ShouldNotHappenException, just throw
            throw $exception;
        } catch (Throwable $throwable) {
            // on parent any Throwable, with special condition message, just return
            if ($throwable->getMessage() === 'Special condition') {
                return;
            }

            throw $throwable;
        }
    }
}

samsonasik · 2025-06-02T00:33:28Z

#6952

github-actions · 2025-11-28T03:25:10Z

This pull request has been automatically locked because it has been closed for 150 days. Please open a new PR if you want to continue the work.