octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-06 19:30:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DX] Improve DowngradeCatchThrowableRector to return nodes directly (#2241)

Browse Source 
Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
Tomas Votruba 2022-05-06 10:09:50 +03:00 committed by GitHub
parent 74b404e1d1
commit ede1106a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rules-tests/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector/Fixture/fixture.php.inc
View File

@ -20,10 +20,10 @@ try {
// Some code...
} catch (\Throwable $e) {
// Code to handle the exception
} catch (\Exception $e) {
// Code to handle the exception
} catch (AnotherException $e) {
// ...
} catch (\Exception $e) {
// Code to handle the exception
}
?>

47
rules/DowngradePhp70/Rector/TryCatch/DowngradeCatchThrowableRector.php
View File

@ -5,7 +5,9 @@ declare(strict_types=1);
namespace Rector\DowngradePhp70\Rector\TryCatch;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Catch_;
use PhpParser\Node\Stmt\TryCatch;
use Rector\Core\Rector\AbstractRector;
@ -66,29 +68,31 @@ CODE_SAMPLE
public function refactor(Node $node): ?Node
{
$originalCatches = $node->catches;
foreach ($node->catches as $key => $catch) {
$shouldAddExceptionFallback =
$this->isCatchingType($catch->types, 'Throwable')
&& ! $this->isCatchingType($catch->types, self::EXCEPTION)
&& ! $this->isCaughtByAnotherClause($catch->stmts, $node->catches);
if ($shouldAddExceptionFallback) {
$catchType = new FullyQualified(self::EXCEPTION);
$this->nodesToAddCollector->addNodeAfterNode(
new Catch_([$catchType], $catch->var, $catch->stmts),
$node->catches[$key]
);
$hasChanged = false;
foreach ($node->catches as $catch) {
if (! $this->shouldAddExceptionFallback($catch, $node)) {
continue;
}
$catchType = new FullyQualified(self::EXCEPTION);
$exceptionCatch = new Catch_([$catchType], $catch->var, $catch->stmts);
$originalCatches[] = $exceptionCatch;
$hasChanged = true;
}
if ($this->nodeComparator->areNodesEqual($node->catches, $originalCatches)) {
if (! $hasChanged) {
return null;
}
$node->catches = $originalCatches;
return $node;
}
/**
* @param Node\Name[] $types
* @param Name[] $types
*/
private function isCatchingType(array $types, string $expected): bool
{
@ -102,8 +106,8 @@ CODE_SAMPLE
}
/**
* @param Node\Stmt[] $body
* @param Node\Stmt\Catch_[] $catches
* @param Stmt[] $body
* @param Catch_[] $catches
*/
private function isCaughtByAnotherClause(array $body, array $catches): bool
{
@ -118,4 +122,17 @@ CODE_SAMPLE
return false;
}
private function shouldAddExceptionFallback(Catch_ $catch, TryCatch $tryCatch): bool
{
if (! $this->isCatchingType($catch->types, 'Throwable')) {
return false;
}
if ($this->isCatchingType($catch->types, self::EXCEPTION)) {
return false;
}
return ! $this->isCaughtByAnotherClause($catch->stmts, $tryCatch->catches);
}
}