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

[EarlyReturn] Move comment in If_ stmt for ChangeAndIfToEarlyReturnRector (#648)

Browse Source
This commit is contained in:
Abdul Malik Ikhsan 2021-08-11 23:02:50 +07:00 committed by GitHub
parent 90fd207cf6
commit e35724edae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/Fixture/move_comment_in_if_stmt.php.inc Normal file
View File

@ -0,0 +1,39 @@
<?php
namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
class MoveCommentInIfStmt
{
public function canDrive(Car $car)
{
if ($car->hasWheels && $car->hasFuel) {
// a comment
return true;
}
return false;
}
}
?>
-----
<?php
namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
class MoveCommentInIfStmt
{
public function canDrive(Car $car)
{
if (!$car->hasWheels) {
return false;
}
if (!$car->hasFuel) {
return false;
}
// a comment
return true;
}
}
?>

42
rules-tests/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector/Fixture/move_comment_in_if_stmt2.php.inc Normal file
View File

@ -0,0 +1,42 @@
<?php
namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
class MoveCommentInIfStmt2
{
public function canDrive(Car $car)
{
if ($car->hasWheels && $car->hasFuel) {
// a comment
return true;
}
// another comment
return false;
}
}
?>
-----
<?php
namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector\Fixture;
class MoveCommentInIfStmt2
{
public function canDrive(Car $car)
{
if (!$car->hasWheels) {
// another comment
return false;
}
if (!$car->hasFuel) {
// another comment
return false;
}
// a comment
return true;
}
}
?>

7
rules/EarlyReturn/NodeFactory/InvertedIfFactory.php
View File

@ -30,10 +30,15 @@ final class InvertedIfFactory
public function createFromConditions(If_ $if, array $conditions, Return_ $return): array
{
$ifs = [];
$stmt = $this->contextAnalyzer->isInLoop($if) && ! $this->getIfNextReturn($if)
$ifNextReturn = $this->getIfNextReturn($if);
$stmt = $this->contextAnalyzer->isInLoop($if) && ! $ifNextReturn
? [new Continue_()]
: [$return];
if ($ifNextReturn instanceof Return_) {
$stmt[0]->setAttribute(AttributeKey::COMMENTS, $ifNextReturn->getAttribute(AttributeKey::COMMENTS));
}
$getNextReturnExpr = $this->getNextReturnExpr($if);
if ($getNextReturnExpr instanceof Return_) {
$return->expr = $getNextReturnExpr->expr;