[phpstan] Fix few static errors

Author: TomasVotruba

phpstan.neon

@@ -317,3 +317,8 @@ parameters:
         -
             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
+
+        - '#Parameter \#1 \$phpVersion of method Rector\\Config\\RectorConfig\:\:phpVersion\(\) expects 50200\|50300\|50400\|50500\|50600\|70000\|70100\|70200\|70300\|70400\|80000\|80100\|80200\|80300\|80400\|100000, 79999 given#'
+
+        # node vs stmts mix
+        - '#expects array<PhpParser\\Node\\Stmt>, array<PhpParser\\Node> given#'

rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php

@@ -44,6 +44,7 @@ public function matchNameWithStmts(string $tag, array $stmts): ?string
 
     /**
      * @param array<Use_|GroupUse> $uses
+     * @return non-empty-string|null
      */
     public function matchNameWithUses(string $tag, array $uses): ?string
     {

src/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php

@@ -31,6 +31,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function resolveTagFullyQualifiedName(string $tag, Node $node): string
     {
         $uniqueId = $tag . spl_object_id($node);
@@ -54,6 +57,7 @@ public function resolveTagFullyQualifiedName(string $tag, Node $node): string
 
     /**
      * @param array<Use_|GroupUse> $uses
+     * @return non-empty-string|null
      */
     private function resolveFullyQualifiedClass(array $uses, Node $node, string $tag): ?string
     {

src/ChangesReporting/Output/ConsoleOutputFormatter.php

@@ -167,7 +167,7 @@ private function addEditorUrl(
         if ($editorUrl !== '') {
             $editorUrl = str_replace(
                 ['%file%', '%relFile%', '%line%'],
-                [$absoluteFilePath, $relativeFilePath, $lineNumber],
+                [(string) $absoluteFilePath, (string) $relativeFilePath, (string) $lineNumber],
                 $editorUrl,
             );
             $filePath = '<href=' . OutputFormatter::escape($editorUrl) . '>' . $filePath . '</>';

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/GlobalVariableNodeVisitor.php

@@ -46,7 +46,10 @@ public function enterNode(Node $node): ?Node
             foreach ($stmt->vars as $variable) {
                 if ($variable instanceof Variable && ! $variable->name instanceof Expr) {
                     $variable->setAttribute(AttributeKey::IS_GLOBAL_VAR, true);
-                    $globalVariableNames[] = $variable->name;
+
+                    /** @var string $variableName */
+                    $variableName = $variable->name;
+                    $globalVariableNames[] = $variableName;
                 }
             }
         }

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/StaticVariableNodeVisitor.php

@@ -44,10 +44,12 @@ public function enterNode(Node $node): ?Node
             }
 
             foreach ($stmt->vars as $staticVar) {
-                if (! $staticVar->var->name instanceof Expr) {
-                    $staticVar->var->setAttribute(AttributeKey::IS_STATIC_VAR, true);
-                    $staticVariableNames[] = $staticVar->var->name;
+                if (! is_string($staticVar->var->name)) {
+                    continue;
                 }
+
+                $staticVar->var->setAttribute(AttributeKey::IS_STATIC_VAR, true);
+                $staticVariableNames[] = $staticVar->var->name;
             }
         }
 

src/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php

@@ -8,6 +8,8 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
+use PHPStan\Type\Accessory\HasMethodType;
+use PHPStan\Type\Accessory\HasPropertyType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
 use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
@@ -39,7 +41,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
     }
 
     /**
-     * @param ObjectWithoutClassType $type
+     * @param ObjectWithoutClassType|HasMethodType|HasPropertyType $type
      */
     public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
     {

src/PhpAttribute/AttributeArrayNameInliner.php

@@ -16,8 +16,8 @@
 final class AttributeArrayNameInliner
 {
     /**
-     * @param Array_|Arg[] $array
-     * @return Arg[]
+     * @param Array_|list<Arg> $array
+     * @return list<Arg>
      */
     public function inlineArrayToArgs(Array_|array $array): array
     {
@@ -29,7 +29,7 @@ public function inlineArrayToArgs(Array_|array $array): array
     }
 
     /**
-     * @return Arg[]
+     * @return list<Arg>
      */
     private function inlineArrayNode(Array_ $array): array
     {
@@ -53,8 +53,8 @@ private function inlineArrayNode(Array_ $array): array
     }
 
     /**
-     * @param Arg[] $args
-     * @return Arg[]
+     * @param list<Arg> $args
+     * @return list<Arg>
      */
     private function inlineArray(array $args): array
     {

src/PhpAttribute/NodeFactory/NamedArgsFactory.php

@@ -16,7 +16,7 @@ final class NamedArgsFactory
 {
     /**
      * @param array<string|int, mixed|Expr> $values
-     * @return Arg[]
+     * @return list<Arg>
      */
     public function createFromValues(array $values): array
     {

src/PhpAttribute/NodeFactory/PhpAttributeGroupFactory.php

@@ -81,7 +81,7 @@ public function create(
         array $uses
     ): AttributeGroup {
         $values = $doctrineAnnotationTagValueNode->getValuesWithSilentKey();
-        $args = $this->createArgsFromItems($values, '', $annotationToAttribute->getClassReferenceFields());
+        $args = $this->createArgsFromItems($values, $annotationToAttribute->getClassReferenceFields());
 
         $this->annotationToAttributeIntegerValueCaster->castAttributeTypes($annotationToAttribute, $args);
 
@@ -112,13 +112,10 @@ public function create(
      * @param ArrayItemNode[]|mixed[] $items
      * @param string[] $classReferencedFields
      *
-     * @return Arg[]
+     * @return list<Arg>
      */
-    public function createArgsFromItems(
-        array $items,
-        string $attributeClass = '',
-        array $classReferencedFields = []
-    ): array {
+    public function createArgsFromItems(array $items, array $classReferencedFields = []): array
+    {
         $mappedItems = $this->annotationToAttributeMapper->map($items);
 
         $this->mapClassReferences($mappedItems, $classReferencedFields);

src/PhpAttribute/NodeFactory/PhpNestedAttributeGroupFactory.php

@@ -114,7 +114,7 @@ public function createNested(
     }
 
     /**
-     * @return Arg[]
+     * @return list<Arg>
      */
     private function createAttributeArgs(
         DoctrineAnnotationTagValueNode $nestedDoctrineAnnotationTagValueNode
@@ -126,7 +126,7 @@ private function createAttributeArgs(
 
     /**
      * @param ArrayItemNode[] $arrayItemNodes
-     * @return Arg[]
+     * @return list<Arg>
      */
     private function createArgsFromItems(array $arrayItemNodes): array
     {

src/PhpParser/ValueObject/StmtsAndTokens.php

@@ -5,12 +5,13 @@
 namespace Rector\PhpParser\ValueObject;
 
 use PhpParser\Node\Stmt;
+use PhpParser\Token;
 
 final readonly class StmtsAndTokens
 {
     /**
      * @param Stmt[] $stmts
-     * @param array<int, array{int, string, int}|string> $tokens
+     * @param Token[] $tokens
      */
     public function __construct(
         private array $stmts,
@@ -27,7 +28,7 @@ public function getStmts(): array
     }
 
     /**
-     * @return array<int, array{int, string, int}|string>
+     * @return array<int, Token[]>
      */
     public function getTokens(): array
     {

tests/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher/ResolveTagToKnownFullyQualifiedNameTest.php

@@ -16,6 +16,7 @@
 use Rector\Testing\Fixture\FixtureFileFinder;
 use Rector\Testing\PHPUnit\AbstractLazyTestCase;
 use Rector\Testing\TestingParser\TestingParser;
+use Webmozart\Assert\Assert;
 
 final class ResolveTagToKnownFullyQualifiedNameTest extends AbstractLazyTestCase
 {
@@ -51,6 +52,7 @@ public function testResolvesClass(string $filePath): void
             $varTagValueNode = $phpDoc->getVarTagValueNode();
             $this->assertInstanceOf(VarTagValueNode::class, $varTagValueNode);
 
+            /** @var non-empty-string $value */
             $value = $varTagValueNode->type->__toString();
             $propertyName = strtolower($this->nodeNameResolver->getName($property));
 
@@ -59,6 +61,8 @@ public function testResolvesClass(string $filePath): void
                 $this->assertStringContainsString('Unknown', $result);
             } elseif (str_contains($propertyName, 'aliased')) {
                 $unaliasedClass = str_replace('Aliased', '', $value);
+                Assert::notEmpty($unaliasedClass);
+
                 $this->assertStringEndsWith($unaliasedClass, $result);
             } elseif (str_starts_with($propertyName, 'known')) {
                 $this->assertStringEndsWith($value, $result);