chore: aim to not rely on internal array pointer but use array_key_fi…

…rst (#7613)
PHP-CS-Fixer · Dec 24, 2023 · 968e789 · 968e789
1 parent 8058b05
commit 968e789
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/src/Fixer/Alias/BacktickToShellExecFixer.php b/src/Fixer/Alias/BacktickToShellExecFixer.php
@@ -95,7 +95,7 @@ private function fixBackticks(Tokens $tokens, array $backtickTokens): void
     {
         // Track indices for final override
         ksort($backtickTokens);
-        $openingBacktickIndex = key($backtickTokens);
+        $openingBacktickIndex = array_key_first($backtickTokens);
         $closingBacktickIndex = array_key_last($backtickTokens);
 
         // Strip enclosing backticks

diff --git a/src/Fixer/Alias/EregToPregFixer.php b/src/Fixer/Alias/EregToPregFixer.php
@@ -188,6 +188,6 @@ private function getBestDelimiter(string $pattern): string
             return $a[0] <=> $b[0];
         });
 
-        return key($delimiters);
+        return array_key_first($delimiters);
     }
 }
diff --git a/src/Fixer/ClassNotation/ClassDefinitionFixer.php b/src/Fixer/ClassNotation/ClassDefinitionFixer.php
@@ -306,11 +306,11 @@ private function getClassyDefinitionInfo(Tokens $tokens, int $classyIndex): arra
 
         if (!$tokens[$classyIndex]->isGivenKind(T_TRAIT)) {
             $extends = $tokens->findGivenKind(T_EXTENDS, $classyIndex, $openIndex);
-            $def['extends'] = [] !== $extends ? $this->getClassyInheritanceInfo($tokens, key($extends), 'numberOfExtends') : false;
+            $def['extends'] = [] !== $extends ? $this->getClassyInheritanceInfo($tokens, array_key_first($extends), 'numberOfExtends') : false;
 
             if (!$tokens[$classyIndex]->isGivenKind(T_INTERFACE)) {
                 $implements = $tokens->findGivenKind(T_IMPLEMENTS, $classyIndex, $openIndex);
-                $def['implements'] = [] !== $implements ? $this->getClassyInheritanceInfo($tokens, key($implements), 'numberOfImplements') : false;
+                $def['implements'] = [] !== $implements ? $this->getClassyInheritanceInfo($tokens, array_key_first($implements), 'numberOfImplements') : false;
                 $def['anonymousClass'] = $tokensAnalyzer->isAnonymousClass($classyIndex);
             }
         }

diff --git a/src/Fixer/ControlStructure/SimplifiedIfReturnFixer.php b/src/Fixer/ControlStructure/SimplifiedIfReturnFixer.php
@@ -106,7 +106,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                     continue;
                 }
 
-                $firstSequenceIndex = key($sequenceFound);
+                $firstSequenceIndex = array_key_first($sequenceFound);
 
                 if ($firstSequenceIndex !== $firstCandidateIndex) {
                     continue;

diff --git a/src/Fixer/FunctionNotation/ImplodeCallFixer.php b/src/Fixer/FunctionNotation/ImplodeCallFixer.php
@@ -78,7 +78,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $argumentsIndices = $this->getArgumentIndices($tokens, $index);
 
             if (1 === \count($argumentsIndices)) {
-                $firstArgumentIndex = key($argumentsIndices);
+                $firstArgumentIndex = array_key_first($argumentsIndices);
                 $tokens->insertAt($firstArgumentIndex, [
                     new Token([T_CONSTANT_ENCAPSED_STRING, "''"]),
                     new Token(','),
@@ -103,7 +103,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 // collect tokens from first argument
                 $firstArgumentEndIndex = $argumentsIndices[key($argumentsIndices)];
                 $newSecondArgumentTokens = [];
-                for ($i = key($argumentsIndices); $i <= $firstArgumentEndIndex; ++$i) {
+                for ($i = array_key_first($argumentsIndices); $i <= $firstArgumentEndIndex; ++$i) {
                     $newSecondArgumentTokens[] = clone $tokens[$i];
                     $tokens->clearAt($i);
                 }

diff --git a/src/Fixer/FunctionNotation/PhpdocToPropertyTypeFixer.php b/src/Fixer/FunctionNotation/PhpdocToPropertyTypeFixer.php
@@ -212,7 +212,7 @@ private function resolveApplicableType(array $propertyIndices, array $annotation
                     continue;
                 }
 
-                $propertyName = key($propertyIndices);
+                $propertyName = array_key_first($propertyIndices);
             }
 
             if (!isset($propertyIndices[$propertyName])) {

diff --git a/src/Fixer/PhpTag/NoClosingTagFixer.php b/src/Fixer/PhpTag/NoClosingTagFixer.php
@@ -48,7 +48,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
         }
 
         $closeTags = $tokens->findGivenKind(T_CLOSE_TAG);
-        $index = key($closeTags);
+        $index = array_key_first($closeTags);
 
         if (isset($tokens[$index - 1]) && $tokens[$index - 1]->isWhitespace()) {
             $tokens->clearAt($index - 1);

diff --git a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
@@ -123,7 +123,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
 
             foreach ($variableTokens as $distinctVariableSet) {
                 if (1 === \count($distinctVariableSet['tokens'])) {
-                    $singleVariableIndex = key($distinctVariableSet['tokens']);
+                    $singleVariableIndex = array_key_first($distinctVariableSet['tokens']);
                     $singleVariableToken = current($distinctVariableSet['tokens']);
                     $tokens->overrideRange($singleVariableIndex, $singleVariableIndex, [
                         new Token([T_CURLY_OPEN, '{']),

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -773,7 +773,7 @@ public function findSequence(array $sequence, int $start = 0, ?int $end = null,
 
         // remove the first token from the sequence, so we can freely iterate through the sequence after a match to
         // the first one is found
-        $key = key($sequence);
+        $key = array_key_first($sequence);
         $firstCs = self::isKeyCaseSensitive($caseSensitive, $key);
         $firstToken = $sequence[$key];
         unset($sequence[$key]);
@@ -872,7 +872,7 @@ public function insertSlices(array $slices): void
         $this->setSize($oldSize + $itemsCount);
 
         krsort($slices);
-        $farthestSliceIndex = key($slices);
+        $farthestSliceIndex = array_key_first($slices);
 
         // We check only the farthest index, if it's within the size of collection, other indices will be valid too.
         if (!\is_int($farthestSliceIndex) || $farthestSliceIndex > $oldSize) {