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 2846b015388fb1eb6d65941481fe9340908c1f79 

2846b01538 [CodeQuality] Skip combine var with property fetch on InlineArrayReturnAssignRector (#5681)
This commit is contained in:
Tomas Votruba 2024-03-03 02:19:56 +00:00
parent 659d1a42fb
commit c34bb45766
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php
View File

@ -47,7 +47,7 @@ final class VariableDimFetchAssignResolver
} }
$assign = $stmtExpr; $assign = $stmtExpr;
$keyExpr = $this->matchKeyOnArrayDimFetchOfVariable($assign, $variable); $keyExpr = $this->matchKeyOnArrayDimFetchOfVariable($assign, $variable);
if ($keyExpr instanceof ArrayDimFetch) { if ($assign->var instanceof ArrayDimFetch && $assign->var->var instanceof ArrayDimFetch) {
return []; return [];
} }
$keysAndExprs[] = new KeyAndExpr($keyExpr, $assign->expr, $stmt->getComments()); $keysAndExprs[] = new KeyAndExpr($keyExpr, $assign->expr, $stmt->getComments());
@ -65,7 +65,7 @@ final class VariableDimFetchAssignResolver
return null; return null;
} }
$arrayDimFetch = $assign->var; $arrayDimFetch = $assign->var;
if ($arrayDimFetch->var instanceof Variable && !$this->nodeComparator->areNodesEqual($arrayDimFetch->var, $variable)) { if (!$this->nodeComparator->areNodesEqual($arrayDimFetch->var, $variable)) {
return null; return null;
} }
$isFoundInExpr = (bool) $this->betterNodeFinder->findFirst($assign->expr, function (Node $subNode) use($variable) : bool { $isFoundInExpr = (bool) $this->betterNodeFinder->findFirst($assign->expr, function (Node $subNode) use($variable) : bool {
@ -74,9 +74,6 @@ final class VariableDimFetchAssignResolver
if ($isFoundInExpr) { if ($isFoundInExpr) {
return null; return null;
} }
if ($arrayDimFetch->var instanceof ArrayDimFetch) {
return $arrayDimFetch->var;
}
return $arrayDimFetch->dim; return $arrayDimFetch->dim;
} }
/** /**

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = 'c591bd291650ab22554ffd819e76d01a1a405719'; public const PACKAGE_VERSION = '2846b015388fb1eb6d65941481fe9340908c1f79';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2024-03-03 09:07:19'; public const RELEASE_DATE = '2024-03-03 09:17:43';
/** /**
* @var int * @var int
*/ */