[phpstan] fix next ingored errors (#6572)

Author: TomasVotruba

bin/rector.php

@@ -105,7 +105,7 @@ public function loadIfExistsAndNotLoadedYet(string $filePath): void
             return;
         }
 
-        /** @var string $realPath always string after file_exists() check */
+        /** @var non-empty-string $realPath always string after file_exists() check */
         $realPath = realpath($filePath);
         $this->alreadyLoadedAutoloadFiles[] = $realPath;
 

phpstan.neon

@@ -69,10 +69,6 @@ parameters:
         -
             identifier: phpstanApi.constructor
 
-        # enforce native type
-        -
-            identifier: varTag.nativeType
-
         # on runtime check
         -
             identifier: deadCode.unreachable
@@ -83,9 +79,6 @@ parameters:
         -
             identifier: argument.type
 
-#        -
-#            identifier: phpstanApi.varTagAssumption
-
         # is nested expr
         -
             message: '#Access to an undefined property PhpParser\\Node\\Expr\:\:\$expr#'
@@ -315,3 +308,12 @@ parameters:
         -
             path: src/NodeTypeResolver/PHPStan/Type/TypeFactory.php
             message: '#Method Rector\\NodeTypeResolver\\PHPStan\\Type\\TypeFactory\:\:uniquateTypes\(\) should return array<TType of PHPStan\\Type\\Type> but returns list<PHPStan\\Type\\Type>#'
+
+        # known types
+        -
+            message: '#PHPDoc tag @var with type array<string, int> is not subtype of native type array<int<1, max>>#'
+            path: rules/Naming/PhpArray/ArrayFilter.php
+
+        -
+            message: '#PHPDoc tag @var with type int is not subtype of native type array\|PHPStan\\PhpDocParser\\Ast\\ConstExpr\\ConstExprNode\|Rector\\BetterPhpDocParser\\PhpDoc\\DoctrineAnnotationTagValueNode\|Rector\\BetterPhpDocParser\\PhpDoc\\StringNode\|Rector\\BetterPhpDocParser\\ValueObject\\PhpDoc\\DoctrineAnnotation\\CurlyListNode\|string#'
+            path: src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php

rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php

@@ -29,6 +29,5 @@ public function inferFunctionLike(ClassMethod|Function_|Closure $functionLike):
         }
 
         return $originalType;
-        // return $this->typeNormalizer->normalizeArrayTypeAndArrayNever($originalType);
     }
 }

src/Autoloading/BootstrapFilesIncluder.php

@@ -48,10 +48,10 @@ private function requireRectorStubs(): void
 
         $dir = new RecursiveDirectoryIterator($stubsRectorDirectory, RecursiveDirectoryIterator::SKIP_DOTS);
 
-        /** @var SplFileInfo[] $stubs */
         $stubs = new RecursiveIteratorIterator($dir);
 
         foreach ($stubs as $stub) {
+            /** @var SplFileInfo $stub */
             require_once $stub->getRealPath();
         }
     }

src/Caching/Detector/ChangedFilesDetector.php

@@ -85,9 +85,7 @@ public function setFirstResolvedConfigFileInfo(string $filePath): void
 
     private function resolvePath(string $filePath): string
     {
-        /** @var string|false $realPath */
         $realPath = realpath($filePath);
-
         if ($realPath === false) {
             return $filePath;
         }

src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php

@@ -5,7 +5,6 @@
 namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
 
 use PhpParser\Node\Identifier;
-use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -178,7 +177,7 @@ private function createGenericArrayType(ArrayType $arrayType, bool $withKey = fa
         // @see https://github.com/phpstan/phpdoc-parser/blob/98a088b17966bdf6ee25c8a4b634df313d8aa531/tests/PHPStan/Parser/PhpDocParserTest.php#L2692-L2696
 
         foreach ($genericTypes as $genericType) {
-            /** @var Node $genericType */
+            /** @var TypeNode $genericType */
             $genericType->setAttribute(self::HAS_GENERIC_TYPE_PARENT, $withKey);
         }
 

src/Skipper/FileSystem/FnMatchPathNormalizer.php

@@ -16,7 +16,6 @@ public function normalizeForFnmatch(string $path): string
         }
 
         if (\str_contains($path, '..')) {
-            /** @var string|false $realPath */
             $realPath = realpath($path);
             if ($realPath === false) {
                 return '';

src/Skipper/RealpathMatcher.php

@@ -10,13 +10,11 @@ final class RealpathMatcher
 {
     public function match(string $matchingPath, string $filePath): bool
     {
-        /** @var string|false $realPathMatchingPath */
         $realPathMatchingPath = realpath($matchingPath);
         if ($realPathMatchingPath === false) {
             return false;
         }
 
-        /** @var string|false $realpathFilePath */
         $realpathFilePath = realpath($filePath);
         if ($realpathFilePath === false) {
             return false;

tests/NodeTypeResolver/StaticTypeMapper/StaticTypeMapperTest.php

@@ -8,7 +8,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\String_;
-use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -63,8 +62,6 @@ public function testMapPHPStanTypeToPHPStanPhpDocTypeNode(): void
 
         $phpStanDocTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($iterableType);
         $this->assertInstanceOf(GenericTypeNode::class, $phpStanDocTypeNode);
-
-        /** @var ArrayTypeNode $phpStanDocTypeNode */
         $this->assertInstanceOf(IdentifierTypeNode::class, $phpStanDocTypeNode->type);
     }