merge ArrayAnalyzer to ExprAnalyzer due to cyclic dependencies

rules/Php81/NodeAnalyzer/ComplexNewAnalyzer.php

@@ -10,12 +10,10 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Name\FullyQualified;
 use Rector\Core\NodeAnalyzer\ExprAnalyzer;
-use Rector\Core\NodeManipulator\ArrayAnalyzer;
 
 final class ComplexNewAnalyzer
 {
     public function __construct(
-        private readonly ArrayAnalyzer $arrayManipulator,
         private readonly ExprAnalyzer  $exprAnalyzer
     ) {
     }

src/NodeAnalyzer/ExprAnalyzer.php

@@ -6,27 +6,24 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Scalar\Encapsed;
+use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\UnionType;
 use Rector\Core\Enum\ObjectReference;
-use Rector\Core\NodeManipulator\ArrayAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
 final class ExprAnalyzer
 {
-    public function __construct(
-        private readonly ArrayAnalyzer $arrayManipulator
-    ) {
-    }
-
     public function isNonTypedFromParam(Expr $expr): bool
     {
         if (! $expr instanceof Variable) {
@@ -64,7 +61,26 @@ public function isDynamicExpr(Expr $expr): bool
             return ! $this->isAllowedConstFetchOrClassConstFetch($expr);
         }
 
-        return $this->arrayManipulator->isDynamicArray($expr);
+        return $this->isDynamicArray($expr);
+    }
+
+    private function isDynamicArray(Array_ $array): bool
+    {
+        foreach ($array->items as $item) {
+            if (! $item instanceof ArrayItem) {
+                continue;
+            }
+
+            if (! $this->isAllowedArrayKey($item->key)) {
+                return true;
+            }
+
+            if (! $this->isAllowedArrayValue($item->value)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     private function isAllowedConstFetchOrClassConstFetch(Expr $expr): bool
@@ -88,4 +104,26 @@ private function isAllowedConstFetchOrClassConstFetch(Expr $expr): bool
 
         return false;
     }
+
+    private function isAllowedArrayKey(?Expr $expr): bool
+    {
+        if (! $expr instanceof Expr) {
+            return true;
+        }
+
+        if ($expr instanceof String_) {
+            return true;
+        }
+
+        return $expr instanceof LNumber;
+    }
+
+    private function isAllowedArrayValue(Expr $expr): bool
+    {
+        if ($expr instanceof Array_) {
+            return ! $this->isDynamicArray($expr);
+        }
+
+        return ! $this->isDynamicExpr($expr);
+    }
 }