bump phpstan to master. Fixed ignored errors

Author: orklah

.github/workflows/push.yml

@@ -149,7 +149,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          args: analyse src --level max --configuration phpstan.neon
+          args: analyse src --configuration phpstan.neon
 
   psalm:
     runs-on: ubuntu-latest

Makefile

@@ -21,7 +21,7 @@ phpcbf:
 
 .PHONY: phpstan
 phpstan:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src --no-progress --level max --configuration phpstan.neon
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src --no-progress --configuration phpstan.neon
 
 .PHONY: psaml
 psalm:

phpstan.neon

@@ -3,6 +3,5 @@ includes:
     - /composer/vendor/phpstan/phpstan-webmozart-assert/extension.neon
 
 parameters:
-    ignoreErrors:
-        # false positive
-        - '#Method phpDocumentor\Reflection\DocBlock\Tags\Method::filterArguments() should return array<array> but returns array<array|string>#'
+    level: max
+        

src/DocBlock/StandardTagFactory.php

@@ -71,8 +71,8 @@ final class StandardTagFactory implements TagFactory
     public const REGEX_TAGNAME = '[\w\-\_\\\\:]+';
 
     /**
-     * @var string[] An array with a tag as a key, and an
-     *      FQCN to a class that handles it as an array value.
+     * @var array<class-string<StaticMethod>> An array with a tag as a key, and an
+     *                                        FQCN to a class that handles it as an array value.
      */
     private $tagHandlerMappings = [
         'author' => Author::class,
@@ -97,7 +97,7 @@ final class StandardTagFactory implements TagFactory
     ];
 
     /**
-     * @var string[] An array with a anotation s a key, and an
+     * @var array<class-string<StaticMethod>> An array with a anotation s a key, and an
      *      FQCN to a class that handles it as an array value.
      */
     private $annotationMappings = [];
@@ -125,7 +125,7 @@ final class StandardTagFactory implements TagFactory
      *
      * @see self::registerTagHandler() to add a new tag handler to the existing default list.
      *
-     * @param string[] $tagHandlers
+     * @param array<class-string<StaticMethod>> $tagHandlers
      */
     public function __construct(FqsenResolver $fqsenResolver, ?array $tagHandlers = null)
     {
@@ -176,6 +176,7 @@ public function registerTagHandler(string $tagName, string $handler) : void
         Assert::classExists($handler);
         /** @var object $handler stupid hack to make phpstan happy.  */
         Assert::implementsInterface($handler, StaticMethod::class);
+        /** @var class-string<StaticMethod> $handler second stupid hack to make phpstan happy.  */
 
         if (strpos($tagName, '\\') && $tagName[0] !== '\\') {
             throw new InvalidArgumentException(

src/DocBlock/TagFactory.php

@@ -14,6 +14,7 @@
 namespace phpDocumentor\Reflection\DocBlock;
 
 use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 
 interface TagFactory
@@ -69,9 +70,9 @@ public function addService(object $service) : void;
      * to register the name of a tag with the FQCN of a 'Tag Handler'. The Tag handler should implement
      * the {@see Tag} interface (and thus the create method).
      *
-     * @param string $tagName Name of tag to register a handler for. When registering a namespaced tag,
-     *                        the full name, along with a prefixing slash MUST be provided.
-     * @param string $handler FQCN of handler.
+     * @param string                     $tagName Name of tag to register a handler for. When registering a namespaced
+     *                                   tag, the full name, along with a prefixing slash MUST be provided.
+     * @param class-string<StaticMethod> $handler FQCN of handler.
      *
      * @throws InvalidArgumentException If the tag name is not a string.
      * @throws InvalidArgumentException If the tag name is namespaced (contains backslashes) but

src/DocBlock/Tags/Method.php

@@ -44,7 +44,11 @@ final class Method extends BaseTag implements Factory\StaticMethod
     /** @var string */
     private $methodName = '';
 
-    /** @var string[][] */
+    /**
+     * @var array<int, array<string, Type|string>>
+     *
+     * @phpstan-var array<int, array{name: string, type: Type}>
+     */
     private $arguments = [];
 
     /** @var bool */
@@ -54,9 +58,9 @@ final class Method extends BaseTag implements Factory\StaticMethod
     private $returnType;
 
     /**
-     * @param mixed[][] $arguments
+     * @param array<int, array<string, Type|string>> $arguments
      *
-     * @psalm-param array<int, array<string, string|Type>|string> $arguments
+     * @phpstan-param array<int, array{name: string, type: Type}|string> $arguments
      */
     public function __construct(
         string $methodName,
@@ -137,7 +141,7 @@ public static function create(
             return null;
         }
 
-        [, $static, $returnType, $methodName, $arguments, $description] = $matches;
+        [, $static, $returnType, $methodName, $argumentLines, $description] = $matches;
 
         $static = $static === 'static';
 
@@ -147,10 +151,12 @@ public static function create(
 
         $returnType  = $typeResolver->resolve($returnType, $context);
         $description = $descriptionFactory->create($description, $context);
-
-        if ($arguments !== '') {
-            $arguments = explode(',', $arguments);
-            foreach ($arguments as &$argument) {
+        
+        /** @phpstan-var array<int, array{name: string, type: Type}> $arguments */
+        $arguments = [];
+        if ($argumentLines !== '') {
+            $argumentsExploded = explode(',', $argumentLines);
+            foreach ($argumentsExploded as $argument) {
                 $argument = explode(' ', self::stripRestArg(trim($argument)), 2);
                 if ($argument[0][0] === '$') {
                     $argumentName = substr($argument[0], 1);
@@ -164,10 +170,8 @@ public static function create(
                     }
                 }
 
-                $argument = ['name' => $argumentName, 'type' => $argumentType];
+                $arguments[] = ['name' => $argumentName, 'type' => $argumentType];
             }
-        } else {
-            $arguments = [];
         }
 
         return new static($methodName, $arguments, $returnType, $static, $description);
@@ -182,7 +186,9 @@ public function getMethodName() : string
     }
 
     /**
-     * @return string[][]
+     * @return array<int, array<string, Type|string>>
+     *
+     * @phpstan-return array<int, array{name: string, type: Type}>
      */
     public function getArguments() : array
     {
@@ -223,8 +229,8 @@ public function __toString() : string
      *
      * @return mixed[][]
      *
-     * @psalm-param array<int, array<string, string|Type>|string> $arguments
-     * @psalm-return array<int, array<string, string|Type>> $arguments
+     * @phpstan-param array<int, array{name: string, type: Type}|string> $arguments
+     * @phpstan-return array<int, array{name: string, type: Type}>
      */
     private function filterArguments(array $arguments = []) : array
     {

src/DocBlock/Tags/Param.php

@@ -69,6 +69,7 @@ public static function create(
 
         $type         = null;
         $parts        = preg_split('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $variableName = '';
         $isVariadic   = false;
 

src/DocBlock/Tags/Property.php

@@ -62,6 +62,7 @@ public static function create(
         [$firstPart, $body] = self::extractTypeFromBody($body);
         $type               = null;
         $parts              = preg_split('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $variableName       = '';
 
         // if the first item that is encountered is not a variable; it is a type

src/DocBlock/Tags/PropertyRead.php

@@ -62,6 +62,7 @@ public static function create(
         [$firstPart, $body] = self::extractTypeFromBody($body);
         $type               = null;
         $parts              = preg_split('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $variableName       = '';
 
         // if the first item that is encountered is not a variable; it is a type

src/DocBlock/Tags/PropertyWrite.php

@@ -62,6 +62,7 @@ public static function create(
         [$firstPart, $body] = self::extractTypeFromBody($body);
         $type               = null;
         $parts              = preg_split('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $variableName       = '';
 
         // if the first item that is encountered is not a variable; it is a type

src/DocBlock/Tags/Var_.php

@@ -62,6 +62,7 @@ public static function create(
         [$firstPart, $body] = self::extractTypeFromBody($body);
 
         $parts        = preg_split('/(\s+)/Su', $body, 2, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $type         = null;
         $variableName = '';
 

src/DocBlockFactory.php

@@ -18,6 +18,7 @@
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
 use phpDocumentor\Reflection\DocBlock\TagFactory;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
 use Webmozart\Assert\Assert;
 use function array_shift;
 use function count;
@@ -51,7 +52,7 @@ public function __construct(DescriptionFactory $descriptionFactory, TagFactory $
     /**
      * Factory method for easy instantiation.
      *
-     * @param string[] $additionalTags
+     * @param array<class-string<StaticMethod>> $additionalTags
      */
     public static function createInstance(array $additionalTags = []) : self
     {
@@ -106,6 +107,9 @@ public function create($docblock, ?Types\Context $context = null, ?Location $loc
         );
     }
 
+    /**
+     * @param class-string<StaticMethod> $handler
+     */
     public function registerTagHandler(string $tagName, string $handler) : void
     {
         $this->tagFactory->registerTagHandler($tagName, $handler);