Update types for Psalm (#1036)

Author: kubawerlos

.dev-tools/psalm.xml

@@ -22,11 +22,6 @@
         <InternalMethod errorLevel='suppress' />
         <MissingConstructor errorLevel='suppress' />
         <MissingOverrideAttribute errorLevel='suppress' />
-        <MixedArgument errorLevel='suppress' />
-        <MixedArrayAccess errorLevel='suppress' />
-        <MixedAssignment errorLevel='suppress' />
-        <MixedOperand errorLevel='suppress' />
-        <MixedReturnStatement errorLevel='suppress' />
         <PossiblyFalseOperand errorLevel='suppress' />
         <PossiblyNullArgument errorLevel='suppress' />
         <PossiblyNullArrayAccess errorLevel='suppress' />

.php-cs-fixer.php

@@ -61,6 +61,7 @@
 $rules[PhpdocTagNoNamedArgumentsFixer::name()] = ['directory' => __DIR__ . '/src/'];
 
 $rules[PhpdocOnlyAllowedAnnotationsFixer::name()]['elements'][] = 'phpstan-type';
+$rules[PhpdocOnlyAllowedAnnotationsFixer::name()]['elements'][] = 'psalm-var';
 
 foreach (new PhpCsFixerCustomFixersDev\Fixers() as $fixer) {
     $rules[$fixer->getName()] = true;

src/Fixer/MultilineCommentOpeningClosingAloneFixer.php

@@ -74,16 +74,26 @@ private function fixOpening(Tokens $tokens, int $index): void
 
         Preg::match('#\\R(\\h*)#', $tokens[$index]->getContent(), $matches);
 
+        // @phpstan-ignore function.alreadyNarrowedType
+        \assert(\is_string($matches[1]));
+
         $indent = $matches[1] . '*';
 
         Preg::match('#^(?<opening>/\\*+)(?<before_newline>.*?)(?<newline>\\R)(?<after_newline>.*)$#s', $tokens[$index]->getContent(), $matches);
         if ($matches === []) {
             return;
         }
 
+        /** @psalm-var string $opening */
         $opening = $matches['opening'];
+
+        /** @psalm-var string $beforeNewline */
         $beforeNewline = $matches['before_newline'];
+
+        /** @psalm-var string $newline */
         $newline = $matches['newline'];
+
+        /** @psalm-var string $afterNewline */
         $afterNewline = $matches['after_newline'];
 
         if ($beforeNewline[0] !== ' ') {
@@ -111,6 +121,7 @@ private function fixClosing(Tokens $tokens, int $index): void
 
         Preg::match('#\\R(\\h*)#', $tokens[$index]->getContent(), $matches);
 
+        /** @psalm-var string $indent */
         $indent = $matches[1];
 
         $newContent = Preg::replace('#(\\R)(.+?)\\h*(\\*+/)$#', \sprintf('$1$2$1%s$3', $indent), $tokens[$index]->getContent());

src/Fixer/PhpdocNoSuperfluousParamFixer.php

@@ -143,6 +143,9 @@ private function getParamName(string $annotation): ?string
             return null;
         }
 
+        // @phpstan-ignore function.alreadyNarrowedType
+        \assert(\is_string($matches[1]));
+
         return $matches[1];
     }
 }