From c34bb45766f5e1aacf16ca897ebd35af1372dd75 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 3 Mar 2024 02:19:56 +0000 Subject: [PATCH] Updated Rector to commit 2846b015388fb1eb6d65941481fe9340908c1f79 https://github.com/rectorphp/rector-src/commit/2846b015388fb1eb6d65941481fe9340908c1f79 [CodeQuality] Skip combine var with property fetch on InlineArrayReturnAssignRector (#5681) --- .../NodeAnalyzer/VariableDimFetchAssignResolver.php | 7 ++----- src/Application/VersionResolver.php | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php b/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php index 7ec190d0557..9042e13cbee 100644 --- a/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php +++ b/rules/CodeQuality/NodeAnalyzer/VariableDimFetchAssignResolver.php @@ -47,7 +47,7 @@ final class VariableDimFetchAssignResolver } $assign = $stmtExpr; $keyExpr = $this->matchKeyOnArrayDimFetchOfVariable($assign, $variable); - if ($keyExpr instanceof ArrayDimFetch) { + if ($assign->var instanceof ArrayDimFetch && $assign->var->var instanceof ArrayDimFetch) { return []; } $keysAndExprs[] = new KeyAndExpr($keyExpr, $assign->expr, $stmt->getComments()); @@ -65,7 +65,7 @@ final class VariableDimFetchAssignResolver return null; } $arrayDimFetch = $assign->var; - if ($arrayDimFetch->var instanceof Variable && !$this->nodeComparator->areNodesEqual($arrayDimFetch->var, $variable)) { + if (!$this->nodeComparator->areNodesEqual($arrayDimFetch->var, $variable)) { return null; } $isFoundInExpr = (bool) $this->betterNodeFinder->findFirst($assign->expr, function (Node $subNode) use($variable) : bool { @@ -74,9 +74,6 @@ final class VariableDimFetchAssignResolver if ($isFoundInExpr) { return null; } - if ($arrayDimFetch->var instanceof ArrayDimFetch) { - return $arrayDimFetch->var; - } return $arrayDimFetch->dim; } /** diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 9f1b69f7d84..6c17ee228c5 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'c591bd291650ab22554ffd819e76d01a1a405719'; + public const PACKAGE_VERSION = '2846b015388fb1eb6d65941481fe9340908c1f79'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-03-03 09:07:19'; + public const RELEASE_DATE = '2024-03-03 09:17:43'; /** * @var int */