minor: phpstan 2.0

Author: kbond

composer.json

@@ -29,7 +29,7 @@
         "league/flysystem-ziparchive": "^3.12",
         "league/glide": "^2.2",
         "league/mime-type-detection": ">=1.8",
-        "phpstan/phpstan": "^1.4",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^9.6.18",
         "srwiez/thumbhash": "^1.2",
         "symfony/browser-kit": "^6.4|^7.0",

src/Filesystem/Attribute/PendingUploadedFile.php

@@ -20,9 +20,6 @@
 
 /**
  * @author Jakub Caban <kuba.iluvatar@gmail.com>
- *
- * @phpstan-consistent-constructor
- * @readonly
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER | \Attribute::TARGET_PROPERTY)]
 class PendingUploadedFile
@@ -48,7 +45,7 @@ public static function forArgument(ArgumentMetadata $argument): self
             $attribute = $attributes[0];
             \assert($attribute instanceof self);
         } else {
-            $attribute = new static();
+            $attribute = new self();
         }
 
         $attribute->path ??= $argument->getName();

src/Filesystem/Glide/GlideTransformUrlGenerator.php

@@ -28,8 +28,8 @@ public function transformUrl(string $path, array|string $filter, Config $config)
     {
         $filter = match (true) {
             \is_string($filter) => ['p' => $filter], // is glide "preset"
-            \is_array($filter) && !\array_is_list($filter) => $filter, // is standard glide parameters
-            \is_array($filter) => ['p' => \implode(',', $filter)], // is array of "presets"
+            !\array_is_list($filter) => $filter, // is standard glide parameters
+            default => ['p' => \implode(',', $filter)], // is array of "presets"
         };
 
         return $this->urlBuilder->getUrl($path, $filter);

src/Filesystem/Node/Directory.php

@@ -19,28 +19,35 @@
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  *
- * @extends \IteratorAggregate<Node|File|Directory>
+ * @extends \IteratorAggregate<File|Directory> (required for intellisense)
+ *
+ * @phpstan-template T of Node = Node
+ * @phpstan-extends \IteratorAggregate<T>
  */
 interface Directory extends Node, \IteratorAggregate
 {
     public function recursive(): static;
 
+    /**
+     * @return File|Directory
+     * @phpstan-return T|null
+     */
     public function first(): ?Node;
 
     /**
      * Filter nodes (return true = include, return false = exclude).
      *
-     * @param callable(Node):bool|callable(File):bool|callable(Directory):bool $predicate
+     * @param callable(T):bool $predicate
      */
     public function filter(callable $predicate): static;
 
     /**
-     * @return $this<File>|File[]
+     * @return static<File>
      */
     public function files(): static;
 
     /**
-     * @return $this<Directory>|Directory[]
+     * @return static<self>
      */
     public function directories(): static;
 
@@ -152,8 +159,6 @@ public function notMatchingPath(string|array $patterns): static;
     /**
      * @see FilesystemReader::listContents()
      *
-     * @return Node[]|File[]|Directory[]|\Traversable<Node|File|Directory>
-     *
      * @throws UnableToListContents
      * @throws FilesystemException
      */

src/Filesystem/Node/Dsn.php

@@ -51,7 +51,7 @@ public static function create(string $filesystem, Path|string $path): self
     public static function normalize(string $value): array
     {
         if (2 === \count($parts = \explode('://', $value, 2))) {
-            return $parts; // @phpstan-ignore return.type
+            return $parts;
         }
 
         return [null, $value];

src/Filesystem/Node/PathGenerator.php

@@ -42,7 +42,7 @@ public function generate(string|Namer|callable $namer, Node $node, array $contex
             $namer = new Namer($namer);
         }
 
-        if (!$namer instanceof Namer && \is_callable($namer)) {
+        if (!$namer instanceof Namer) {
             return (new CallbackPathGenerator($namer))->generatePath($node, $context);
         }
 

src/Filesystem/Symfony/Serializer/NodeNormalizer.php

@@ -25,7 +25,6 @@
 use Zenstruck\Filesystem\Node\File\Image\LazyImage;
 use Zenstruck\Filesystem\Node\File\LazyFile;
 use Zenstruck\Filesystem\Node\File\PendingFile;
-use Zenstruck\Filesystem\Node\LazyNode;
 use Zenstruck\Filesystem\Node\Mapping;
 use Zenstruck\Filesystem\Node\PathGenerator;
 
@@ -72,7 +71,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
             $data = [Mapping::FILENAME => $data];
         }
 
-        /** @var LazyNode $node */
+        /** @var LazyDirectory|LazyFile $node */
         $node = new (self::TYPE_MAP[$type])($data);
         $filesystem = $mapping->filesystem();
 

src/Filesystem/Test/InteractsWithFilesystem.php

@@ -26,7 +26,7 @@
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-trait InteractsWithFilesystem
+trait InteractsWithFilesystem // @phpstan-ignore trait.unused
 {
     private TestFilesystem $_testFilesystem;
 

src/Filesystem/Test/ResetFilesystem.php

@@ -17,7 +17,7 @@
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-trait ResetFilesystem
+trait ResetFilesystem // @phpstan-ignore trait.unused
 {
     /**
      * @before