From 0d818ab9272ae8dc0b5413718fd4708e751ade24 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 15 Sep 2025 06:25:03 +0700 Subject: [PATCH 1/2] [CodeQuality] Skip init is before if on InlineArrayReturnAssignRector --- .../Fixture/skip_init_before_if.php.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_init_before_if.php.inc diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_init_before_if.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_init_before_if.php.inc new file mode 100644 index 00000000000..4f2b38e86ac --- /dev/null +++ b/rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_init_before_if.php.inc @@ -0,0 +1,18 @@ + Date: Mon, 15 Sep 2025 06:27:52 +0700 Subject: [PATCH 2/2] Fix --- .../Rector/ClassMethod/InlineArrayReturnAssignRector.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php b/rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php index 3e1027ad356..cd44767737f 100644 --- a/rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php +++ b/rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php @@ -106,6 +106,11 @@ public function refactor(Node $node): ?Node return null; } + // init maybe from before if + if ($emptyArrayAssign === null && ! $node instanceof FunctionLike) { + return null; + } + $keysAndExprsByKey = $this->variableDimFetchAssignResolver->resolveFromStmtsAndVariable( $stmts, $emptyArrayAssign,