remove array item scope, as handled in array

Author: TomasVotruba

rules/CodeQuality/Rector/Coalesce/CoalesceToTernaryRector.php

@@ -4,18 +4,18 @@
 
 namespace Rector\CodeQuality\Rector\Coalesce;
 
-use PHPStan\Type\UnionType;
-use PHPStan\Type\NullType;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\BinaryOp\Coalesce;
 use PhpParser\Node\Expr\Ternary;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\NullType;
+use PHPStan\Type\UnionType;
+use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use Rector\PHPStan\ScopeFetcher;
 
 /**
  * @see \Rector\Tests\CodeQuality\Rector\Coalesce\CoalesceToTernaryRector\CoalesceToTernaryRectorTest

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/Console/Command/WorkerCommand.php

@@ -131,7 +131,12 @@ private function runWorker(
         $encoder->on(ReactEvent::ERROR, $handleErrorCallback);
 
         // 2. collect diffs + errors from file processor
-        $decoder->on(ReactEvent::DATA, function (array $json) use ($preFileCallback, $encoder, $configuration, $input): void {
+        $decoder->on(ReactEvent::DATA, function (array $json) use (
+            $preFileCallback,
+            $encoder,
+            $configuration,
+            $input
+        ): void {
             $action = $json[ReactCommand::ACTION];
             if ($action !== Action::MAIN) {
                 return;
@@ -154,7 +159,9 @@ private function runWorker(
             $encoder->write([
                 ReactCommand::ACTION => Action::RESULT,
                 self::RESULT => [
-                    Bridge::FILE_DIFFS => $processResult->getFileDiffs($input->getOption(Option::OUTPUT_FORMAT) !== 'json'),
+                    Bridge::FILE_DIFFS => $processResult->getFileDiffs(
+                        $input->getOption(Option::OUTPUT_FORMAT) !== 'json'
+                    ),
                     Bridge::FILES_COUNT => count($filePaths),
                     Bridge::SYSTEM_ERRORS => $processResult->getSystemErrors(),
                     Bridge::SYSTEM_ERRORS_COUNT => count($processResult->getSystemErrors()),