octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 96a1476e3e88b749a08408a9b827ce84f35bc237 

96a1476e3e [CodeQuality] Add Else and ElseIf on CompleteMissingIfElseBracketRector (#5124)
This commit is contained in:
Tomas Votruba 2023-10-05 23:23:03 +00:00
parent ac5bf36e11
commit 9144868d77
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php
View File

@ -4,6 +4,8 @@ declare (strict_types=1);
namespace Rector\CodeQuality\Rector\If_;
use PhpParser\Node;
use PhpParser\Node\Stmt\Else_;
use PhpParser\Node\Stmt\ElseIf_;
use PhpParser\Node\Stmt\If_;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
@ -44,10 +46,10 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [If_::class];
return [If_::class, ElseIf_::class, Else_::class];
}
/**
* @param If_ $node
* @param If_|ElseIf_|Else_ $node
*/
public function refactor(Node $node) : ?Node
{
@ -64,11 +66,16 @@ CODE_SAMPLE
}
/**
* @param mixed[] $oldTokens
* @param \PhpParser\Node\Stmt\If_|\PhpParser\Node\Stmt\ElseIf_|\PhpParser\Node\Stmt\Else_ $if
*/
private function isIfConditionFollowedByOpeningCurlyBracket(If_ $if, array $oldTokens) : bool
private function isIfConditionFollowedByOpeningCurlyBracket($if, array $oldTokens) : bool
{
for ($i = $if->getStartTokenPos(); $i < $if->getEndTokenPos(); ++$i) {
if ($oldTokens[$i] !== ')') {
if ($oldTokens[$i] === ';') {
// all good
return \true;
}
continue;
}
// first closing bracket must be followed by curly opening brackets
@ -85,7 +92,10 @@ CODE_SAMPLE
}
return \false;
}
private function isBareNewNode(If_ $if) : bool
/**
* @param \PhpParser\Node\Stmt\If_|\PhpParser\Node\Stmt\ElseIf_|\PhpParser\Node\Stmt\Else_ $if
*/
private function isBareNewNode($if) : bool
{
$originalNode = $if->getAttribute(AttributeKey::ORIGINAL_NODE);
if (!$originalNode instanceof Node) {

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '19661946681f61b5ab70ebf39df91a8bf9679fcc';
public const PACKAGE_VERSION = '96a1476e3e88b749a08408a9b827ce84f35bc237';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-10-06 05:25:55';
public const RELEASE_DATE = '2023-10-06 06:20:17';
/**
* @var int
*/