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 diff --git a/src/NodeAnalyzer/ExprAnalyzer.php b/src/NodeAnalyzer/ExprAnalyzer.php index 7eeb4005cf7..a71a77f35a9 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 +final readonly class ExprAnalyzer { + public function __construct( + private 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); }