From 97a19e266005d046e6858ba598294bc96cf7063a Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 3 Jul 2026 14:05:18 +0200
Subject: [PATCH] [TypeDeclaration] Skip property fetch on array dim fetch in
 StrictArrayParamDimFetchRector

---
 .../Fixture/skip_instanceof_param.php.inc     | 19 +++++++++++
 .../skip_property_fetch_on_dim_fetch.php.inc  | 22 +++++++++++++
 .../Source/Lead.php                           | 16 +++++++++
 .../StrictArrayParamDimFetchRector.php        | 33 +++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_instanceof_param.php.inc
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_property_fetch_on_dim_fetch.php.inc
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Source/Lead.php

diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_instanceof_param.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_instanceof_param.php.inc
new file mode 100644
index 00000000000..8c2d33fd1d1
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_instanceof_param.php.inc
@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Source\Lead;
+
+class SkipInstanceofParam
+{
+    public function populateCompanyData($entity)
+    {
+        if ($entity instanceof Lead) {
+            $fields = $entity->getPrimaryCompany();
+        } else {
+            $fields = $entity['primaryCompany'];
+        }
+
+        return $fields;
+    }
+}
diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_property_fetch_on_dim_fetch.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_property_fetch_on_dim_fetch.php.inc
new file mode 100644
index 00000000000..8b5933b0308
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_property_fetch_on_dim_fetch.php.inc
@@ -0,0 +1,22 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+class SkipPropertyFetchOnDimFetch
+{
+    /**
+     * @param object $object
+     */
+    private function getDataForObject($object): mixed
+    {
+        foreach ($object as $key => $value) {
+            if (0 === $key) {
+                continue;
+            }
+
+            $object[0]->$key = $value;
+        }
+
+        return $object[0];
+    }
+}
diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Source/Lead.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Source/Lead.php
new file mode 100644
index 00000000000..fce4c6660a7
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Source/Lead.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Source;
+
+final class Lead
+{
+    /**
+     * @return mixed[]
+     */
+    public function getPrimaryCompany(): array
+    {
+        return [];
+    }
+}
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php b/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
index dabe5b87848..84c34b4af86 100644
--- a/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
+++ b/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
@@ -16,7 +16,10 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Empty_;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\PropertyFetch;
+use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Identifier;
@@ -244,6 +247,14 @@ private function shouldStop(Node $node, string $paramName): bool
             return true;
         }
 
+        if ($this->isPropertyFetchedOnArrayDimFetch($node, $paramName)) {
+            return true;
+        }
+
+        if ($this->isInstanceofParam($node, $paramName)) {
+            return true;
+        }
+
         return $this->isReassignAndUseAsArg($node, $paramName);
     }
 
@@ -288,6 +299,28 @@ private function isEmptyOrEchoedOrCasted(Node $node, string $paramName): bool
         return $node instanceof Array_ && $node->expr instanceof Variable && $this->isName($node->expr, $paramName);
     }
 
+    private function isPropertyFetchedOnArrayDimFetch(Node $node, string $paramName): bool
+    {
+        if (! $node instanceof PropertyFetch && ! $node instanceof StaticPropertyFetch) {
+            return false;
+        }
+
+        $fetchedOn = $node instanceof PropertyFetch ? $node->var : $node->class;
+        if (! $fetchedOn instanceof ArrayDimFetch) {
+            return false;
+        }
+
+        return $fetchedOn->var instanceof Variable && $this->isName($fetchedOn->var, $paramName);
+    }
+
+    private function isInstanceofParam(Node $node, string $paramName): bool
+    {
+        return $node instanceof Instanceof_ && $node->expr instanceof Variable && $this->isName(
+            $node->expr,
+            $paramName
+        );
+    }
+
     private function isMethodCall(string $paramName, ?Node $node): bool
     {
         if ($node instanceof MethodCall) {