Fix types for fixers (#279)

Author: kubawerlos

dev-tools/phpstan.neon

@@ -23,7 +23,6 @@ parameters:
  - ../src/Fixer/NumericLiteralSeparatorFixer.php
  - ../src/Fixer/OperatorLinebreakFixer.php
  - ../src/Fixer/PhpUnitNoUselessReturnFixer.php
- - ../src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php
  - ../src/Fixer/PhpdocOnlyAllowedAnnotationsFixer.php
  - ../src/Fixer/PhpdocParamTypeFixer.php
  - ../src/Fixer/PhpdocSelfAccessorFixer.php

dev-tools/psalm.xml

@@ -27,7 +27,6 @@
  <InvalidArgument errorLevel='suppress' />
  <LoopInvalidation errorLevel='suppress' />
  <MixedArgument errorLevel='suppress' />
- <MixedArgumentTypeCoercion errorLevel='suppress' />
  <MixedArrayAccess errorLevel='suppress' />
  <MixedAssignment errorLevel='suppress' />
  <MixedMethodCall errorLevel='suppress' />

src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php

@@ -63,16 +63,19 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
  return;
  }
 
- if ($tokens[$nextIndex]->isGivenKind([T_PRIVATE, T_PROTECTED, T_PUBLIC, T_VAR, T_STATIC])) {
+ /** @var Token $nextToken */
+ $nextToken = $tokens[$nextIndex];
+
+ if ($nextToken->isGivenKind([T_PRIVATE, T_PROTECTED, T_PUBLIC, T_VAR, T_STATIC])) {
  continue;
  }
 
- if ($tokens[$nextIndex]->isGivenKind(T_VARIABLE)) {
- $this->removeVarAnnotation($tokens, $index, [$tokens[$nextIndex]->getContent()]);
+ if ($nextToken->isGivenKind(T_VARIABLE)) {
+ $this->removeVarAnnotation($tokens, $index, [$nextToken->getContent()]);
  continue;
  }
 
- if ($tokens[$nextIndex]->isGivenKind([T_FOR, T_FOREACH, T_IF, T_SWITCH, T_WHILE])) {
+ if ($nextToken->isGivenKind([T_FOR, T_FOREACH, T_IF, T_SWITCH, T_WHILE])) {
  $this->removeVarAnnotationForControl($tokens, $index, $nextIndex);
  continue;
  }
@@ -108,6 +111,7 @@ private function removeVarAnnotationForControl(Tokens $tokens, int $commentIndex
  $variables = [];
 
  for ($index = $index + 1; $index < $endIndex; $index++) {
+ /** @var Token $token */
  $token = $tokens[$index];
 
  if ($token->isGivenKind(T_VARIABLE)) {
@@ -120,7 +124,10 @@ private function removeVarAnnotationForControl(Tokens $tokens, int $commentIndex
 
  private function removeVarAnnotationNotMatchingPattern(Tokens $tokens, int $index, ?string $pattern): void
  {
- $doc = new DocBlock($tokens[$index]->getContent());
+ /** @var Token $token */
+ $token = $tokens[$index];
+
+ $doc = new DocBlock($token->getContent());
 
  foreach ($doc->getAnnotationsOfType(['var']) as $annotation) {
  if ($pattern === null || Preg::match($pattern, $annotation->getContent()) !== 1) {
@@ -130,7 +137,7 @@ private function removeVarAnnotationNotMatchingPattern(Tokens $tokens, int $inde
 
  $content = $doc->getContent();
 
- if ($content === $tokens[$index]->getContent()) {
+ if ($content === $token->getContent()) {
  return;
  }