Simplify Tokens::detectBlockType types (#818)

kubawerlos · Sep 26, 2022 · c529b14 · c529b14
1 parent 553fb81
commit c529b14
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 7 deletions.
diff --git a/.dev-tools/phpstan.neon b/.dev-tools/phpstan.neon
@@ -4,7 +4,6 @@ parameters:
   excludePaths:
     - ./src/Readme
   ignoreErrors:
-    - '~^Parameter #1 \$type of method PhpCsFixer\\Tokenizer\\Tokens::findBlock(Start|End)\(\) expects [\d\|]+, int given\.$~'
     - '~^Parameter #1 \$token of class PhpCsFixer\\Tokenizer\\Token constructor expects array\{int, string\}\|string, array\{int\|null, string\} given\.$~'
     - message: '#^Call to an undefined method PhpCsFixer\\Fixer\\FixerInterface::[a-zA-Z]+\(\)\.$#'
       path: ../tests

diff --git a/src/Analyzer/FunctionAnalyzer.php b/src/Analyzer/FunctionAnalyzer.php
@@ -34,7 +34,6 @@ public static function getFunctionArguments(Tokens $tokens, int $index): array
         $arguments = [];
         $index = $currentArgumentStart = $argumentStartIndex;
         while ($index < $argumentsEndIndex) {
-            /** @var null|array{isStart: bool, type: int} $blockType */
             $blockType = Tokens::detectBlockType($tokens[$index]);
             if ($blockType !== null && $blockType['isStart']) {
                 $index = $tokens->findBlockEnd($blockType['type'], $index);

diff --git a/src/Analyzer/SwitchAnalyzer.php b/src/Analyzer/SwitchAnalyzer.php
@@ -101,7 +101,6 @@ private function getNextSameLevelToken(Tokens $tokens, int $index): int
             return (new self())->getSwitchAnalysis($tokens, $index)->getCasesEnd();
         }
 
-        /** @var null|array{isStart: bool, type: int} $blockType */
         $blockType = Tokens::detectBlockType($tokens[$index]);
         if ($blockType !== null && $blockType['isStart']) {
             return $tokens->findBlockEnd($blockType['type'], $index) + 1;

diff --git a/src/Fixer/MultilinePromotedPropertiesFixer.php b/src/Fixer/MultilinePromotedPropertiesFixer.php
@@ -131,7 +131,6 @@ private function fixParameters(Tokens $tokens, int $openParenthesis, int $closeP
             $index = $tokens->getPrevMeaningfulToken($index);
             \assert(\is_int($index));
 
-            /** @var null|array{isStart: bool, type: int} $blockType */
             $blockType = Tokens::detectBlockType($tokens[$index]);
             if ($blockType !== null && !$blockType['isStart']) {
                 $index = $tokens->findBlockStart($blockType['type'], $index);

diff --git a/src/Fixer/NoUselessParenthesisFixer.php b/src/Fixer/NoUselessParenthesisFixer.php
@@ -54,7 +54,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            /** @var array{isStart: bool, type: int} $blockType */
+            /** @var array{type: Tokens::BLOCK_TYPE_*, isStart: bool} $blockType */
             $blockType = Tokens::detectBlockType($tokens[$index]);
             $blockEndIndex = $tokens->findBlockEnd($blockType['type'], $index);
 

diff --git a/src/Fixer/PhpdocVarAnnotationToAssertFixer.php b/src/Fixer/PhpdocVarAnnotationToAssertFixer.php
@@ -195,7 +195,6 @@ private function getExpressionEnd(Tokens $tokens, int $index): int
             $index = $tokens->getNextMeaningfulToken($index);
             \assert(\is_int($index));
 
-            /** @var null|array{isStart: bool, type: int} $blockType */
             $blockType = Tokens::detectBlockType($tokens[$index]);
             if ($blockType !== null && $blockType['isStart']) {
                 $index = $tokens->findBlockEnd($blockType['type'], $index);

diff --git a/src/Fixer/PromotedConstructorPropertyFixer.php b/src/Fixer/PromotedConstructorPropertyFixer.php
@@ -351,7 +351,6 @@ private function getTokenOfKindSibling(Tokens $tokens, int $direction, int $inde
         $index += $direction;
 
         while (!$tokens[$index]->equalsAny($tokenKinds)) {
-            /** @var null|array{isStart: bool, type: int} $blockType */
             $blockType = Tokens::detectBlockType($tokens[$index]);
 
             if ($blockType !== null) {