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 22bf404fbdc1fa1a01aa3075363b1a6d7414d171 

22bf404fbd [CodeQuality] Handle on closure, anonymous function, method call on CompleteMissingIfElseBracketRector (#5135)
This commit is contained in:
Tomas Votruba 2023-10-06 21:49:08 +00:00
parent b405743bb9
commit 16af101457
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,30 +75,21 @@ CODE_SAMPLE
if (!$startStmt instanceof Stmt) {
return \true;
}
/** @var Stmt $lastStmt */
$lastStmt = \end($if->stmts);
for ($i = $if->getStartTokenPos(); $i < $lastStmt->getEndTokenPos(); ++$i) {
if (!isset($oldTokens[$i + 1])) {
break;
$startTokenPos = $if->getStartTokenPos();
$i = $startStmt->getStartTokenPos() - 1;
$condEndTokenPos = $if instanceof Else_ ? 0 : $if->cond->getEndTokenPos();
while (isset($oldTokens[$i])) {
if ($i === $condEndTokenPos) {
return \false;
}
if ($oldTokens[$i] !== ')' && !\is_array($oldTokens[$i + 1])) {
continue;
}
// first closing bracket must be followed by curly opening brackets
// what is next token?
$nextToken = $oldTokens[$i + 1];
if (\is_array($nextToken) && \trim((string) $nextToken[1]) === '') {
// next token is whitespace
$nextToken = $oldTokens[$i + 2];
}
if (\in_array($nextToken, ['{', ':'], \true)) {
if (\in_array($oldTokens[$i], ['{', ':'], \true)) {
// all good
return \true;
}
if (\is_array($nextToken) && \trim((string) $nextToken[1]) === '?>') {
// all good
return \true;
if ($i === $startTokenPos) {
return \false;
}
--$i;
}
return \false;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'dbd374ba2a2899d247d9c9e087aedf455462fffe';
public const PACKAGE_VERSION = '22bf404fbdc1fa1a01aa3075363b1a6d7414d171';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-10-07 02:02:37';
public const RELEASE_DATE = '2023-10-07 04:46:07';
/**
* @var int
*/