bump phpstan level to 6

composer.json

@@ -16,7 +16,8 @@
         "friendsofphp/php-cs-fixer": "^3.27",
         "nette/php-generator": "^4.0",
         "phpunit/phpunit": "^10.5",
-        "phpstan/phpstan": "^2.0"
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,9 +1,17 @@
 includes:
 	- vendor/phpstan/phpstan/conf/bleedingEdge.neon
+	- vendor/phpstan/phpstan-phpunit/extension.neon
 parameters:
 	phpVersion: 80100
-	level: 5
+	level: 6
 	paths:
 		- src
 		- tests
 		- generators
+	ignoreErrors:
+		-
+			identifier: argument.templateType
+			path: tests/Collection/MapTest.php
+		-
+			identifier: missingType.generics
+			path: src/Collection/Stream/Collectors.php

src/Collection/GenericList.php

@@ -19,13 +19,16 @@ abstract class GenericList extends Sequence
      *
      * @param U ...$elements
      *
-     * @return GenericList<U>
+     * @return self<U>
      */
     public static function of(...$elements): self
     {
         return self::ofAll($elements);
     }
 
+    /**
+     * @return self<T>
+     */
     public static function empty(): self
     {
         return Nil::instance();
@@ -36,7 +39,7 @@ public static function empty(): self
      *
      * @param iterable<U> $elements
      *
-     * @return GenericList<U>
+     * @return self<U>
      */
     public static function ofAll(iterable $elements): self
     {
@@ -65,7 +68,7 @@ public static function range(int $start, int $end): self
      *
      * @param callable(T):U $mapper
      *
-     * @return GenericList<U>
+     * @return self<U>
      */
     public function map(callable $mapper): self
     {
@@ -81,10 +84,11 @@ public function map(callable $mapper): self
      *
      * @param callable(T): Traversable<U> $mapper
      *
-     * @return GenericList<U>
+     * @return self<U>
      */
     public function flatMap(callable $mapper)
     {
+        /** @var self<U> $list */
         $list = self::empty();
         foreach ($this as $value) {
             foreach ($mapper($value) as $mapped) {
@@ -98,7 +102,7 @@ public function flatMap(callable $mapper)
     /**
      * @param callable(T):bool $predicate
      *
-     * @return GenericList<T>
+     * @return self<T>
      */
     public function filter(callable $predicate)
     {

src/Collection/GenericList/Nil.php

@@ -18,6 +18,9 @@ private function __construct()
     {
     }
 
+    /**
+     * @return self<T>
+     */
     public static function instance(): self
     {
         return new self();

src/Collection/Iterator.php

@@ -11,6 +11,8 @@
 
 /**
  * @template T
+ *
+ * @implements \Iterator<int, T>
  */
 class Iterator implements \Iterator
 {
@@ -51,11 +53,21 @@ public static function of(...$elements): self
         return new ArrayIterator($elements);
     }
 
+    /**
+     * @return self<T>
+     */
     public static function empty(): self
     {
         return EmptyIterator::instance();
     }
 
+    /**
+     * @template U
+     *
+     * @param iterable<U> $elements
+     *
+     * @return self<U>
+     */
     public static function fromIterable(iterable $elements): self
     {
         if ($elements instanceof self) {

src/Collection/Iterator/EmptyIterator.php

@@ -7,12 +7,20 @@
 use Munus\Collection\Iterator;
 use Munus\Exception\NoSuchElementException;
 
+/**
+ * @template T
+ *
+ * @template-extends Iterator<T>
+ */
 final class EmptyIterator extends Iterator
 {
     private function __construct()
     {
     }
 
+    /**
+     * @return self<T>
+     */
     public static function instance(): self
     {
         return new self();
@@ -24,7 +32,9 @@ public function hasNext(): bool
     }
 
     /**
-     * @return void
+     * @throws NoSuchElementException
+     *
+     * @return never-return
      */
     public function next()
     {

src/Collection/Iterator/MapIterator.php

@@ -11,6 +11,8 @@
 /**
  * @template K
  * @template V
+ *
+ * @template-extends Iterator<Tuple2<K, V>>
  */
 final class MapIterator extends Iterator
 {

src/Collection/Iterator/SingletonIterator.php

@@ -9,6 +9,8 @@
 
 /**
  * @template T
+ *
+ * @template-extends Iterator<T>
  */
 final class SingletonIterator extends Iterator
 {