From c9574fc3e4b761b52b0ba2809df92523645319ea Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 24 May 2026 20:28:27 +0700 Subject: [PATCH 1/3] [CodeQuality] Skip possibly undefined variable on SimplifyEmptyCheckOnEmptyArrayRector --- .../skip_possibly_undefined_variable.php.inc | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 rules-tests/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector/Fixture/skip_possibly_undefined_variable.php.inc diff --git a/rules-tests/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector/Fixture/skip_possibly_undefined_variable.php.inc b/rules-tests/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector/Fixture/skip_possibly_undefined_variable.php.inc new file mode 100644 index 00000000000..2dbfe261cb6 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector/Fixture/skip_possibly_undefined_variable.php.inc @@ -0,0 +1,20 @@ + 1]; + } + + // empty() tolerates an undefined $map; `$map === []` does not. + if (empty($map)) { + return []; + } + + return $map; + } +} \ No newline at end of file From 558fdff3c7a6ca96d1b163357cd59d15d0c8c58b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 24 May 2026 20:28:53 +0700 Subject: [PATCH 2/3] fix --- src/NodeAnalyzer/ExprAnalyzer.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/NodeAnalyzer/ExprAnalyzer.php b/src/NodeAnalyzer/ExprAnalyzer.php index 7eeb4005cf7..789816f5387 100644 --- a/src/NodeAnalyzer/ExprAnalyzer.php +++ b/src/NodeAnalyzer/ExprAnalyzer.php @@ -54,10 +54,16 @@ use PHPStan\Type\ObjectWithoutClassType; use PHPStan\Type\UnionType; use Rector\Enum\ObjectReference; +use Rector\NodeNameResolver\NodeNameResolver; use Rector\NodeTypeResolver\Node\AttributeKey; final class ExprAnalyzer { + public function __construct( + private readonly NodeNameResolver $nodeNameResolver + ) { + } + public function isBoolExpr(Expr $expr): bool { return $expr instanceof BooleanNot @@ -158,6 +164,10 @@ public function isNonTypedFromParam(Expr $expr): bool return true; } + if (! $scope->hasVariableType((string) $this->nodeNameResolver->getName($expr))->yes()) { + return true; + } + if ($nativeType instanceof UnionType) { return ! $nativeType->equals($type); } From 264266a089f5632b297664b68324661d12d5bcc0 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 24 May 2026 13:30:30 +0000 Subject: [PATCH 3/3] [ci-review] Rector Rectify --- src/NodeAnalyzer/ExprAnalyzer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NodeAnalyzer/ExprAnalyzer.php b/src/NodeAnalyzer/ExprAnalyzer.php index 789816f5387..a71a77f35a9 100644 --- a/src/NodeAnalyzer/ExprAnalyzer.php +++ b/src/NodeAnalyzer/ExprAnalyzer.php @@ -57,10 +57,10 @@ use Rector\NodeNameResolver\NodeNameResolver; use Rector\NodeTypeResolver\Node\AttributeKey; -final class ExprAnalyzer +final readonly class ExprAnalyzer { public function __construct( - private readonly NodeNameResolver $nodeNameResolver + private NodeNameResolver $nodeNameResolver ) { }