mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-22 18:54:39 +01:00
Code Issues Projects Releases Wiki Activity

fix SimplifyIfReturnBoolRector

Browse Source
This commit is contained in:
Tomas Votruba 2018-11-05 02:41:47 +01:00
parent a8a1198aa6
commit eb796af9fd
4 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CodeQuality/src/Rector/If_/SimplifyIfReturnBoolRector.php
View File

@ -79,6 +79,10 @@ CODE_SAMPLE
return true;
}
if (count($ifNode->elseifs) > 0) {
return true;
}
$ifInnerNode = $ifNode->stmts[0];
if (! $ifInnerNode instanceof Return_) {
return true;

19
packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/Correct/correct8.php.inc Normal file
View File

@ -0,0 +1,19 @@
<?php
if (is_null($value)) {
return false;
} elseif (is_string($value) && trim($value) === '') {
return false;
} elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
return false;
} elseif ($value instanceof File) {
return (string) $value->getPath() !== '';
}
return true;
if (is_null($value)) {
return false;
} else {
return true;
}

1
packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php
View File

@ -27,6 +27,7 @@ final class SimplifyIfReturnBoolRectorTest extends AbstractRectorTestCase
yield [__DIR__ . '/Wrong/wrong5.php.inc', __DIR__ . '/Correct/correct5.php.inc'];
yield [__DIR__ . '/Wrong/wrong6.php.inc', __DIR__ . '/Correct/correct6.php.inc'];
yield [__DIR__ . '/Wrong/wrong7.php.inc', __DIR__ . '/Correct/correct7.php.inc'];
yield [__DIR__ . '/Wrong/wrong8.php.inc', __DIR__ . '/Correct/correct8.php.inc'];
}
protected function provideConfig(): string

19
packages/CodeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/Wrong/wrong8.php.inc Normal file
View File

@ -0,0 +1,19 @@
<?php
if (is_null($value)) {
return false;
} elseif (is_string($value) && trim($value) === '') {
return false;
} elseif ((is_array($value) || $value instanceof Countable) && count($value) < 1) {
return false;
} elseif ($value instanceof File) {
return (string) $value->getPath() !== '';
}
return true;
if (is_null($value)) {
return false;
} else {
return true;
}