[transform] tidy up array dim fetch to method call rector

Author: TomasVotruba

…r/Fixture/partial_transformation.php.inc …tor/Fixture/handle_container_get.php.incrules-tests/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector/Fixture/partial_transformation.php.inc renamed to rules-tests/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector/Fixture/handle_container_get.php.inc rules-tests/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector/Fixture/partial_transformation.php.inc renamed to rules-tests/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector/Fixture/handle_container_get.php.inc

@@ -4,9 +4,6 @@ namespace Rector\Tests\Transform\Rector\ArrayDimFetch\ArrayDimFetchToMethodCallR
 
 /** @var \Container $object */
 $object['key'];
-$object['key'] = 'value';
-isset($object['key']);
-unset($object['key']);
 
 ?>
 -----
@@ -16,8 +13,5 @@ namespace Rector\Tests\Transform\Rector\ArrayDimFetch\ArrayDimFetchToMethodCallR
 
 /** @var \Container $object */
 $object->get('key');
-$object['key'] = 'value';
-isset($object['key']);
-unset($object['key']);
 
 ?>

rules-tests/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector/Fixture/skip_container_set_isset_unset.php.inc

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Tests\Transform\Rector\ArrayDimFetch\ArrayDimFetchToMethodCallRector\Fixture;
+
+/** @var \Container $object */
+$object['key'] = 'value';
+isset($object['key']);
+unset($object['key']);

rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php

@@ -19,6 +19,7 @@
 use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Rector\Transform\ValueObject\ArrayDimFetchToMethodCall;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@@ -87,11 +88,20 @@ public function refactor(Node $node): array|Expr|null|int
                 return null;
             }
 
-            return $this->getMethodCall($node->var, 'set', $node->expr)
-                ?? NodeVisitor::DONT_TRAVERSE_CHILDREN;
+            $setMethodCall = $this->createExplicitMethodCall($node->var, 'set', $node->expr);
+            if ($setMethodCall instanceof MethodCall) {
+                return $setMethodCall;
+            }
+
+            return null;
         }
 
-        return $this->getMethodCall($node, 'get');
+        // is part of assign, skip
+        if ($node->getAttribute(AttributeKey::IS_BEING_ASSIGNED)) {
+            return null;
+        }
+
+        return $this->createExplicitMethodCall($node, 'get');
     }
 
     public function configure(array $configuration): void
@@ -108,7 +118,7 @@ private function handleIsset(Isset_ $isset): Expr|int|null
 
         foreach ($isset->vars as $var) {
             if ($var instanceof ArrayDimFetch) {
-                $methodCall = $this->getMethodCall($var, 'exists');
+                $methodCall = $this->createExplicitMethodCall($var, 'exists');
 
                 if ($methodCall instanceof MethodCall) {
                     $exprs[] = $methodCall;
@@ -147,7 +157,7 @@ private function handleUnset(Unset_ $unset): array|int
 
         foreach ($unset->vars as $var) {
             if ($var instanceof ArrayDimFetch) {
-                $methodCall = $this->getMethodCall($var, 'unset');
+                $methodCall = $this->createExplicitMethodCall($var, 'unset');
 
                 if ($methodCall instanceof MethodCall) {
                     $stmts[] = new Expression($methodCall);
@@ -173,8 +183,11 @@ private function handleUnset(Unset_ $unset): array|int
     /**
      * @param 'get'|'set'|'exists'|'unset' $action
      */
-    private function getMethodCall(ArrayDimFetch $arrayDimFetch, string $action, ?Expr $expr = null): ?MethodCall
-    {
+    private function createExplicitMethodCall(
+        ArrayDimFetch $arrayDimFetch,
+        string $action,
+        ?Expr $expr = null
+    ): ?MethodCall {
         if (! $arrayDimFetch->dim instanceof Node) {
             return null;
         }

src/Reporting/DeprecatedRulesReporter.php

@@ -4,12 +4,12 @@
 
 namespace Rector\Reporting;
 
-use Rector\PhpParser\Enum\NodeGroup;
 use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Contract\Rector\RectorInterface;
+use Rector\PhpParser\Enum\NodeGroup;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 final readonly class DeprecatedRulesReporter