chore: rename variables (#7847)

PHP-CS-Fixer · Feb 19, 2024 · 8794475 · 8794475
1 parent 0edbfb9
commit 8794475
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git a/dev-tools/phpstan/baseline.php b/dev-tools/phpstan/baseline.php
@@ -36,11 +36,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Fixer/CastNotation/NoShortBoolCastFixer.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Foreach overwrites \\$pos with its value variable\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/ClassNotation/OrderedClassElementsFixer.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^For loop initial assignment overwrites variable \\$index\\.$#',
 	'count' => 1,
@@ -101,11 +96,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Fixer/Whitespace/StatementIndentationFixer.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^For loop initial assignment overwrites variable \\$i\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Whitespace/StatementIndentationFixer.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$className \\(string\\) of method PhpCsFixer\\\\StdinFileInfo\\:\\:getFileInfo\\(\\) should be contravariant with parameter \\$class \\(string\\|null\\) of method SplFileInfo\\:\\:getFileInfo\\(\\)$#',
 	'count' => 1,
@@ -116,11 +106,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/StdinFileInfo.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Foreach overwrites \\$key with its key variable\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Tokenizer/Tokens.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$array \\(array\\<int, PhpCsFixer\\\\Tokenizer\\\\Token\\>\\) of method PhpCsFixer\\\\Tokenizer\\\\Tokens\\:\\:fromArray\\(\\) should be contravariant with parameter \\$array \\(array\\<int, mixed\\>\\) of method SplFixedArray\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\:\\:fromArray\\(\\)$#',
 	'count' => 1,

diff --git a/src/Fixer/ClassNotation/OrderedClassElementsFixer.php b/src/Fixer/ClassNotation/OrderedClassElementsFixer.php
@@ -115,10 +115,10 @@ public function configure(array $configuration): void
         parent::configure($configuration);
 
         $this->typePosition = [];
-        $pos = 0;
+        $position = 0;
 
         foreach ($this->configuration['order'] as $type) {
-            $this->typePosition[$type] = $pos++;
+            $this->typePosition[$type] = $position++;
         }
 
         foreach (self::$typeHierarchy as $type => $parents) {

diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -735,22 +735,22 @@ private function isCommentWithFixableIndentation(Tokens $tokens, int $index): bo
 
         $firstCommentIndex = $index;
         while (true) {
-            $i = $this->getSiblingContinuousSingleLineComment($tokens, $firstCommentIndex, false);
-            if (null === $i) {
+            $firstCommentCandidateIndex = $this->getSiblingContinuousSingleLineComment($tokens, $firstCommentIndex, false);
+            if (null === $firstCommentCandidateIndex) {
                 break;
             }
 
-            $firstCommentIndex = $i;
+            $firstCommentIndex = $firstCommentCandidateIndex;
         }
 
         $lastCommentIndex = $index;
         while (true) {
-            $i = $this->getSiblingContinuousSingleLineComment($tokens, $lastCommentIndex, true);
-            if (null === $i) {
+            $lastCommentCandidateIndex = $this->getSiblingContinuousSingleLineComment($tokens, $lastCommentIndex, true);
+            if (null === $lastCommentCandidateIndex) {
                 break;
             }
 
-            $lastCommentIndex = $i;
+            $lastCommentIndex = $lastCommentCandidateIndex;
         }
 
         if ($firstCommentIndex === $lastCommentIndex) {

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -804,10 +804,10 @@ 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 = array_key_first($sequence);
-        $firstCs = self::isKeyCaseSensitive($caseSensitive, $key);
-        $firstToken = $sequence[$key];
-        unset($sequence[$key]);
+        $firstKey = array_key_first($sequence);
+        $firstCs = self::isKeyCaseSensitive($caseSensitive, $firstKey);
+        $firstToken = $sequence[$firstKey];
+        unset($sequence[$firstKey]);
 
         // begin searching for the first token in the sequence (start included)
         $index = $start - 1;