remove array item scope, as handled in array

Author: TomasVotruba

rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php

@@ -69,13 +69,9 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-<<<<<<< HEAD
         $oldTokens = $this->getFile()
             ->getOldTokens();
-=======
-        $oldTokens = $this->file->getOldTokens();
 
->>>>>>> 7556383dcf ([experiment] skip beforeTraverse() and afterTraverse() as never used)
         if ($this->isIfConditionFollowedByOpeningCurlyBracket($node, $oldTokens)) {
             return null;
         }

rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Throw_;
 use PhpParser\Node\Name;
+use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;

rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php

@@ -179,7 +179,6 @@ private function shouldSkip(ArrayDimFetch $arrayDimFetch, Node $scopeNode): bool
         if ($scope->isInExpressionAssign($arrayDimFetch)) {
             return true;
         }
-<<<<<<< HEAD
 
         if ($arrayDimFetch->getAttribute(AttributeKey::IS_BEING_ASSIGNED) === true) {
             return true;
@@ -189,8 +188,6 @@ private function shouldSkip(ArrayDimFetch $arrayDimFetch, Node $scopeNode): bool
             return true;
         }
 
-=======
->>>>>>> ce85ccbfcc (fixup! [experiment] skip beforeTraverse() and afterTraverse() as never used)
         return (bool) $arrayDimFetch->getAttribute(AttributeKey::IS_UNSET_VAR);
     }
 }

src/Rector/AbstractRector.php

@@ -60,14 +60,11 @@ abstract class AbstractRector extends NodeVisitorAbstract implements RectorInter
 
     protected NodeComparator $nodeComparator;
 
-<<<<<<< HEAD
     /**
      * @deprecated Use getFile() instead.
      */
     protected File $file;
 
-=======
->>>>>>> 7556383dcf ([experiment] skip beforeTraverse() and afterTraverse() as never used)
     protected Skipper $skipper;
 
     private ChangedNodeScopeRefresher $changedNodeScopeRefresher;