[NodeTypeResolver] Remove unused AttributeKey::INSIDE_ARRAY_ITEM on C…

…ontextNodeVisitor (#4496) * [NodeTypeResolver] Remove unused AttributeKey::INSIDE_ARRAY_ITEM on ContextNodeVisitor * [ci-review] Rector Rectify * Fix test * Fix test * Fix test --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Jul 12, 2023 · 9e9a314 · 9e9a314
1 parent 77167c7
commit 9e9a314
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/packages/NodeTypeResolver/Node/AttributeKey.php b/packages/NodeTypeResolver/Node/AttributeKey.php
@@ -326,9 +326,4 @@ final class AttributeKey
      * @var string
      */
     public const INSIDE_ARRAY_DIM_FETCH = 'inside_array_dim_fetch';
-
-    /**
-     * @var string
-     */
-    public const INSIDE_ARRAY_ITEM = 'inside_array_item';
 }
diff --git a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
@@ -10,10 +10,8 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayDimFetch;
-use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Isset_;
-use PhpParser\Node\Expr\Match_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
@@ -51,13 +49,6 @@ private function processInsideArrayDimFetch(ArrayDimFetch $arrayDimFetch): void
         }
     }
 
-    private function processInsideArrayItem(ArrayItem $arrayItem): void
-    {
-        if ($arrayItem->value instanceof Match_) {
-            $arrayItem->value->setAttribute(AttributeKey::INSIDE_ARRAY_ITEM, true);
-        }
-    }
-
     public function enterNode(Node $node): ?Node
     {
         if ($node instanceof For_ || $node instanceof Foreach_ || $node instanceof While_ || $node instanceof Do_) {
@@ -70,11 +61,6 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        if ($node instanceof ArrayItem && $node->value instanceof Match_) {
-            $this->processInsideArrayItem($node);
-            return null;
-        }
-
         if ($node instanceof Isset_ || $node instanceof Unset_) {
             $this->processContextInIssetOrUnset($node);
             return null;

diff --git a/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php b/rules-tests/Arguments/Rector/RectorOrder/config/configured_rule.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\PHPUnit\Rector\MethodCall\AssertComparisonToSpecificMethodRector;
-use Rector\PHPUnit\Rector\MethodCall\AssertFalseStrposToContainsRector;
-use Rector\PHPUnit\Rector\MethodCall\AssertSameBoolNullToSpecificMethodRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertComparisonToSpecificMethodRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertFalseStrposToContainsRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertSameBoolNullToSpecificMethodRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(AssertComparisonToSpecificMethodRector::class);

diff --git a/tests/Issues/UndefinedStmtIndex/config/configured_rule.php b/tests/Issues/UndefinedStmtIndex/config/configured_rule.php
@@ -4,7 +4,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\StmtsAwareInterface\RemoveJustPropertyFetchForAssignRector;
-use Rector\PHPUnit\Rector\Foreach_\SimplifyForeachInstanceOfRector;
+use Rector\PHPUnit\CodeQuality\Rector\Foreach_\SimplifyForeachInstanceOfRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(RemoveJustPropertyFetchForAssignRector::class);