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

[EarlyReturn] Skip left or right is BooleanAnd on ChangeOrIfReturnToEarlyReturnRector (#799)

Browse Source 
* [EarlyReturn] Handle left or right is BooleanAnd on ChangeOrIfReturnToEarlyReturnRector

* skip

* remove tweak in DateTimeToDateTimeInterfaceRector

* naming

* remove tweak in RemoveAlwaysElseRector

* rename fixture
This commit is contained in:
Abdul Malik Ikhsan 2021-08-31 21:56:48 +07:00 committed by GitHub
parent c42b1969ce
commit 2e18cab758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 100 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php
View File

@ -97,10 +97,7 @@ CODE_SAMPLE
{
if ($node instanceof ClassMethod) {
$this->refactorClassMethod($node);
// @see https://github.com/rectorphp/rector-src/pull/794
// avoid duplicated ifs and returns when combined with ChangeOrIfReturnToEarlyReturnRector and ChangeAndIfToEarlyReturnRector
return null;
return $node;
}
return $this->refactorProperty($node);

13
rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php
View File

@ -6,6 +6,7 @@ namespace Rector\EarlyReturn\Rector\If_;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BinaryOp\BooleanOr;
use PhpParser\Node\Expr\Instanceof_;
use PhpParser\Node\Stmt\If_;
@ -86,7 +87,7 @@ CODE_SAMPLE
return null;
}
if ($this->isInstanceofCondOnly($node->cond)) {
if ($this->isInstanceofCondOnlyOrHasBooleanAnd($node->cond)) {
return null;
}
@ -166,16 +167,20 @@ CODE_SAMPLE
);
}
private function isInstanceofCondOnly(BooleanOr $booleanOr): bool
private function isInstanceofCondOnlyOrHasBooleanAnd(BooleanOr $booleanOr): bool
{
$currentNode = $booleanOr;
if ($currentNode->left instanceof BooleanAnd || $currentNode->right instanceof BooleanAnd) {
return true;
}
if ($currentNode->left instanceof BooleanOr) {
return $this->isInstanceofCondOnly($currentNode->left);
return $this->isInstanceofCondOnlyOrHasBooleanAnd($currentNode->left);
}
if ($currentNode->right instanceof BooleanOr) {
return $this->isInstanceofCondOnly($currentNode->right);
return $this->isInstanceofCondOnlyOrHasBooleanAnd($currentNode->right);
}
if (! $currentNode->right instanceof Instanceof_) {

6
rules/EarlyReturn/Rector/If_/RemoveAlwaysElseRector.php
View File

@ -121,12 +121,6 @@ CODE_SAMPLE
private function shouldSkip(If_ $if): bool
{
// to avoid repetitive If_ creation when used along with ChangeOrIfReturnToEarlyReturnRector
// @see https://github.com/rectorphp/rector-src/pull/651
if ($if->cond instanceof BooleanOr && $if->elseifs !== []) {
return true;
}
// to avoid repetitive flipped elseif above return when used along with ChangeAndIfReturnToEarlyReturnRector
// @see https://github.com/rectorphp/rector-src/pull/654
return $if->cond instanceof BooleanAnd && count($if->elseifs) > 1;

41
tests/Issues/IssueEarlyReturnAndOr/Fixture/fixture.php.inc
View File

@ -1,41 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOr\Fixture;
class ComplexAndOr
{
public function run($a, $b, $c, $d)
{
if (($a && false === $b) || ! $c) {
return '';
}
return $d;
}
}
?>
-----
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOr\Fixture;
class ComplexAndOr
{
public function run($a, $b, $c, $d)
{
if ($a && false === $b) {
return '';
}
if (! $c) {
return '';
}
return $d;
}
}
?>

19
tests/Issues/IssueEarlyReturnAndOr/Fixture/skip_next_or.php.inc Normal file
View File

@ -0,0 +1,19 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOr\Fixture;
class SkipAndNextOr
{
public function run($a, $b, $c, $d)
{
if (($a && false === $b) || ! $c) {
return '';
}
return $d;
}
}
?>

59
tests/Issues/IssueEarlyReturnAndOrDatetime/Fixture/and_next_or.php.inc
View File

@ -1,59 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrDatetime\Fixture;
class AndNextOr
{
public function run($a, $b, $c, $d)
{
if ($a && $b || $c) {
return null;
}
$a = 1;
$b = 2;
if ($b > $a) {
return null;
}
$d = 1;
return;
}
}
?>
-----
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrDatetime\Fixture;
class AndNextOr
{
public function run($a, $b, $c, $d)
{
if ($a && $b) {
return null;
}
if ($c) {
return null;
}
$a = 1;
$b = 2;
if ($b > $a) {
return null;
}
$d = 1;
return;
}
}
?>

28
tests/Issues/IssueEarlyReturnAndOrDatetime/Fixture/skip_and_next_or.php.inc Normal file
View File

@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrDatetime\Fixture;
class SkipAndNextOr
{
public function run($a, $b, $c, $d)
{
if ($a && $b || $c) {
return null;
}
$a = 1;
$b = 2;
if ($b > $a) {
return null;
}
$d = 1;
return;
}
}
?>

42
tests/Issues/IssueReturnBeforeElseIf/Fixture/complex_if_cond_or.php.inc Normal file
View File

@ -0,0 +1,42 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueReturnBeforeElseIf\Fixture;
class ComplexIfCondOr
{
public function run($a, $b, $c, $d, $e)
{
if (($a && false === $b) || ! $c) {
return '';
} elseif ($d) {
return '';
}
return $e;
}
}
?>
-----
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueReturnBeforeElseIf\Fixture;
class ComplexIfCondOr
{
public function run($a, $b, $c, $d, $e)
{
if (($a && false === $b) || ! $c) {
return '';
}
if ($d) {
return '';
}
return $e;
}
}
?>

5
tests/Issues/IssueReturnBeforeElseIf/Fixture/complex_if_cond_or_without_elseif.php.inc
View File

@ -28,10 +28,7 @@ class ComplexIfCondOrWithoutElseIf
{
public function run($a, $b, $c)
{
if ($a && false === $b) {
return 'a';
}
if (! $c) {
if (($a && false === $b) || ! $c) {
return 'a';
}
return 'b';

20
tests/Issues/IssueReturnBeforeElseIf/Fixture/skip_complex_if_cond_or.php.inc
View File

@ -1,20 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\Core\Tests\Issues\IssueReturnBeforeElseIf\Fixture;
class SkipComplexIfCondOr
{
public function run($a, $b, $c, $d, $e)
{
if (($a && false === $b) || ! $c) {
return '';
} elseif ($d) {
return '';
}
return $e;
}
}
?>