Psalm 5.4 upgrade

composer.json

@@ -37,7 +37,8 @@
     ],
     "require": {
         "php": ">= 8",
-        "loophp/iterators": "^2.3.1"
+        "loophp/iterators": "^2.3.1",
+        "vimeo/psalm": "dev-master#f723e08221c5028612d928241c84d9cac7fe6d86"
     },
     "require-dev": {
         "amphp/parallel-functions": "^1",

phpstan-baseline.neon

@@ -25,6 +25,11 @@ parameters:
 			count: 1
 			path: src/Collection.php
 
+		-
+			message: "#^Method loophp\\\\collection\\\\Collection\\:\\:squash\\(\\) should return loophp\\\\collection\\\\Contract\\\\Collection\\<TKey, T\\> but returns loophp\\\\collection\\\\Contract\\\\Collection\\<int, array\\{TKey, T\\}\\>\\.$#"
+			count: 1
+			path: src/Collection.php
+
 		-
 			message: "#^Method loophp\\\\collection\\\\Collection\\:\\:tails\\(\\) should return loophp\\\\collection\\\\Contract\\\\Collection\\<int, array\\<int, T\\>\\> but returns loophp\\\\collection\\\\Collection\\<int, array\\<int, mixed\\>\\>\\.$#"
 			count: 1
@@ -41,7 +46,7 @@ parameters:
 			path: src/Collection.php
 
 		-
-			message: "#^Method loophp\\\\collection\\\\Collection\\:\\:wrap\\(\\) should return loophp\\\\collection\\\\Contract\\\\Collection\\<int, array\\<\\(int&TKey\\)\\|\\(string&TKey\\), T\\>\\> but returns loophp\\\\collection\\\\Collection\\<int, array\\>\\.$#"
+			message: "#^Method loophp\\\\collection\\\\Collection\\:\\:wrap\\(\\) should return loophp\\\\collection\\\\Contract\\\\Collection\\<int, array\\<\\(int&TKey\\)\\|\\(string&TKey\\), T\\>\\> but returns loophp\\\\collection\\\\Collection\\<int, array\\<int\\|string, mixed\\>\\>\\.$#"
 			count: 1
 			path: src/Collection.php
 
@@ -57,7 +62,7 @@ parameters:
 
 		-
 			message: "#^Parameter \\#1 \\$callable of class loophp\\\\collection\\\\Collection constructor expects callable\\(\\.\\.\\.mixed\\)\\: iterable, Closure\\(iterable\\)\\: Generator\\<mixed, mixed, mixed, mixed\\> given\\.$#"
-			count: 14
+			count: 13
 			path: src/Collection.php
 
 		-
@@ -70,6 +75,11 @@ parameters:
 			count: 1
 			path: src/Collection.php
 
+		-
+			message: "#^Parameter \\#1 \\$callable of class loophp\\\\collection\\\\Collection constructor expects callable\\(\\.\\.\\.mixed\\)\\: iterable, Closure\\(iterable\\<array\\{mixed, mixed\\}\\>\\)\\: Generator\\<mixed, mixed, mixed, mixed\\> given\\.$#"
+			count: 1
+			path: src/Collection.php
+
 		-
 			message: "#^Parameter \\#1 \\$callable of class loophp\\\\collection\\\\Collection constructor expects callable\\(\\.\\.\\.mixed\\)\\: iterable\\<array\\<int, mixed\\>\\>, Closure\\(iterable\\)\\: Generator\\<mixed, array\\<int, mixed\\>, mixed, mixed\\> given\\.$#"
 			count: 1
@@ -96,7 +106,7 @@ parameters:
 			path: src/Collection.php
 
 		-
-			message: "#^Parameter \\#1 \\$callable of class loophp\\\\collection\\\\Collection constructor expects callable\\(\\.\\.\\.mixed\\)\\: iterable\\<int, array\\>, Closure\\(iterable\\)\\: Generator\\<int, array, mixed, mixed\\> given\\.$#"
+			message: "#^Parameter \\#1 \\$callable of class loophp\\\\collection\\\\Collection constructor expects callable\\(\\.\\.\\.mixed\\)\\: iterable\\<int, array\\<int\\|string, mixed\\>\\>, Closure\\(iterable\\)\\: Generator\\<int, array\\<int\\|string, mixed\\>, mixed, mixed\\> given\\.$#"
 			count: 1
 			path: src/Collection.php
 
@@ -150,6 +160,11 @@ parameters:
 			count: 1
 			path: src/CollectionDecorator.php
 
+		-
+			message: "#^Template type U of method loophp\\\\collection\\\\Operation\\\\Append\\:\\:__invoke\\(\\) is not referenced in a parameter\\.$#"
+			count: 1
+			path: src/Operation/Append.php
+
 		-
 			message: "#^Template type NewT of method loophp\\\\collection\\\\Operation\\\\Associate\\:\\:__invoke\\(\\) is not referenced in a parameter\\.$#"
 			count: 1
@@ -240,6 +255,11 @@ parameters:
 			count: 1
 			path: src/Operation/Map.php
 
+		-
+			message: "#^Template type U of method loophp\\\\collection\\\\Operation\\\\Prepend\\:\\:__invoke\\(\\) is not referenced in a parameter\\.$#"
+			count: 1
+			path: src/Operation/Prepend.php
+
 		-
 			message: "#^Template type U of method loophp\\\\collection\\\\Operation\\\\Product\\:\\:__invoke\\(\\) is not referenced in a parameter\\.$#"
 			count: 1
@@ -314,3 +334,8 @@ parameters:
 			message: "#^While loop condition is always true\\.$#"
 			count: 1
 			path: tests/static-analysis/scanRight1.php
+
+		-
+			message: "#^Parameter \\#1 \\$collection of function unfold_checkList expects loophp\\\\collection\\\\Contract\\\\Collection\\<int, iterable\\>, loophp\\\\collection\\\\Contract\\\\Collection\\<int, iterable\\<\\(int\\|string\\), mixed\\>\\> given\\.$#"
+			count: 3
+			path: tests/static-analysis/unfold.php

psalm-baseline.xml

@@ -1,58 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
+<files psalm-version="dev-master@c6cfa86f35350842d00e8f1f3b92839fbda5f8f9">
   <file src="src/Collection.php">
-    <InvalidArgument occurrences="1">
+    <InvalidArgument>
       <code>$callback</code>
+      <code>$parameters</code>
     </InvalidArgument>
-    <InvalidReturnStatement occurrences="1">
+    <InvalidReturnStatement>
+      <code>new self((new Operation\Unfold())()($parameters)($callback))</code>
       <code>new self((new Operation\Wrap())(), [$this])</code>
     </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
+    <InvalidReturnType>
+      <code>CollectionInterface</code>
       <code>CollectionInterface</code>
     </InvalidReturnType>
-    <PossiblyNullArgument occurrences="2">
+    <PossiblyNullArgument>
       <code>$default</code>
       <code>$default</code>
     </PossiblyNullArgument>
   </file>
   <file src="src/CollectionDecorator.php">
-    <InvalidArgument occurrences="4">
+    <InvalidArgument>
       <code>foldLeft1</code>
       <code>foldRight1</code>
-      <code>scanLeft1</code>
-      <code>scanRight1</code>
     </InvalidArgument>
-    <InvalidReturnType occurrences="8">
-      <code>array</code>
-      <code>static</code>
-      <code>static</code>
-      <code>static</code>
-      <code>static</code>
-      <code>static</code>
-      <code>static</code>
+    <InvalidReturnType>
       <code>static</code>
     </InvalidReturnType>
   </file>
   <file src="src/Operation/All.php">
-    <InvalidReturnStatement occurrences="1"/>
-    <InvalidReturnType occurrences="1">
+    <InvalidReturnStatement>
+      <code>static fn (bool $normalize): Closure =&gt;
+                /**
+                 * @param iterable&lt;TKey, T&gt; $iterable
+                 *
+                 * @return Generator&lt;int, T&gt;|Generator&lt;TKey, T&gt;
+                 */
+                static fn (iterable $iterable): Generator =&gt; yield from ($normalize ? (new Normalize())()($iterable) : $iterable)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType>
       <code>Closure(bool): Closure(iterable&lt;TKey, T&gt;): (Generator&lt;int, T&gt;|Generator&lt;TKey, T&gt;)</code>
     </InvalidReturnType>
   </file>
-  <file src="src/Operation/Inits.php">
-    <InvalidArgument occurrences="2">
-      <code>[]</code>
-    </InvalidArgument>
-  </file>
-  <file src="src/Operation/Pack.php">
-    <InvalidReturnType occurrences="1">
-      <code>Generator&lt;int, array{0: TKey, 1: T}&gt;</code>
-    </InvalidReturnType>
+  <file src="src/Operation/Pluck.php">
+    <ArgumentTypeCoercion>
+      <code>$segment</code>
+    </ArgumentTypeCoercion>
   </file>
   <file src="src/Operation/Product.php">
-    <InvalidArgument occurrences="2">
+    <InvalidArgument>
       <code>[[]]</code>
       <code>static fn (iterable $a, iterable $x): Generator =&gt; $f($x)($a)</code>
     </InvalidArgument>
   </file>
+  <file src="src/Operation/Zip.php">
+    <MoreSpecificReturnType>
+      <code>Generator&lt;list&lt;TKey|UKey|null&gt;, list&lt;T|U|null&gt;&gt;</code>
+    </MoreSpecificReturnType>
+  </file>
+  <file src="tests/static-analysis/partition.php">
+    <PossiblyUndefinedArrayOffset>
+      <code>$left</code>
+      <code>$left</code>
+    </PossiblyUndefinedArrayOffset>
+  </file>
+  <file src="tests/static-analysis/span.php">
+    <PossiblyUndefinedArrayOffset>
+      <code>$left</code>
+      <code>$left</code>
+    </PossiblyUndefinedArrayOffset>
+  </file>
 </files>

src/Collection.php

@@ -127,7 +127,7 @@ public function compact(mixed ...$values): CollectionInterface
         return new self((new Operation\Compact())()($values), [$this]);
     }
 
-    public function compare(callable $comparator, $default = null): mixed
+    public function compare(callable $comparator, $default = null)
     {
         return (new self((new Operation\Compare())()($comparator), [$this]))->current(0, $default);
     }
@@ -142,7 +142,7 @@ public function count(): int
         return iterator_count($this);
     }
 
-    public function current(int $index = 0, $default = null): mixed
+    public function current(int $index = 0, $default = null)
     {
         return (new Operation\Current())()($index)($default)($this)->current();
     }
@@ -266,12 +266,12 @@ public function filter(callable ...$callbacks): CollectionInterface
         return new self((new Operation\Filter())()(...$callbacks), [$this]);
     }
 
-    public function find(mixed $default = null, callable ...$callbacks): mixed
+    public function find(mixed $default = null, callable ...$callbacks)
     {
         return (new Operation\Find())()($default)(...$callbacks)($this)->current();
     }
 
-    public function first(mixed $default = null): mixed
+    public function first(mixed $default = null)
     {
         return (new self((new Operation\First())(), [$this]))->current(0, $default);
     }
@@ -389,7 +389,7 @@ public static function fromString(string $string, string $delimiter = ''): Colle
         return new self(static fn (): Generator => yield from new StringIteratorAggregate($string, $delimiter));
     }
 
-    public function get(mixed $key, mixed $default = null): mixed
+    public function get(mixed $key, mixed $default = null)
     {
         return (new self((new Operation\Get())()($key)($default), [$this]))->current(0, $default);
     }
@@ -417,7 +417,7 @@ public function has(callable ...$callbacks): bool
         return (new Operation\Has())()(...$callbacks)($this)->current();
     }
 
-    public function head(mixed $default = null): mixed
+    public function head(mixed $default = null)
     {
         return (new self((new Operation\Head())(), [$this]))->current(0, $default);
     }
@@ -483,7 +483,7 @@ public function jsonSerialize(): array
         return $this->all(false);
     }
 
-    public function key(int $index = 0): mixed
+    public function key(int $index = 0)
     {
         return (new Operation\Key())()($index)($this)->current();
     }
@@ -493,7 +493,7 @@ public function keys(): CollectionInterface
         return new self((new Operation\Keys())(), [$this]);
     }
 
-    public function last(mixed $default = null): mixed
+    public function last(mixed $default = null)
     {
         return (new self((new Operation\Last())(), [$this]))->current(0, $default);
     }
@@ -528,7 +528,7 @@ public function matching(Criteria $criteria): CollectionInterface
         return new self((new Operation\Matching())()($criteria), [$this]);
     }
 
-    public function max(mixed $default = null): mixed
+    public function max(mixed $default = null)
     {
         return (new self((new Operation\Max())(), [$this]))->current(0, $default);
     }
@@ -538,7 +538,7 @@ public function merge(iterable ...$sources): CollectionInterface
         return new self((new Operation\Merge())()(...$sources), [$this]);
     }
 
-    public function min(mixed $default = null): mixed
+    public function min(mixed $default = null)
     {
         return (new self((new Operation\Min())(), [$this]))->current(0, $default);
     }

src/Contract/Collection.php

@@ -118,7 +118,7 @@
  * @template-extends Operation\Transposeable<TKey, T>
  * @template-extends Operation\Truthyable<TKey, T>
  * @template-extends Operation\Unlinesable<TKey, T>
- * @template-extends Operation\Unpackable<mixed, array{0: TKey, 1: T}>
+ * @template-extends Operation\Unpackable<TKey, T>
  * @template-extends Operation\Unpairable<TKey, T>
  * @template-extends Operation\Untilable<TKey, T>
  * @template-extends Operation\Unwindowable<TKey, T>

src/Contract/Operation/Comparable.php

@@ -29,5 +29,5 @@ interface Comparable
      *
      * @return T|V
      */
-    public function compare(callable $comparator, mixed $default = null): mixed;
+    public function compare(callable $comparator, mixed $default = null);
 }

src/Contract/Operation/Currentable.php

@@ -21,5 +21,5 @@ interface Currentable
      *
      * @return T|V
      */
-    public function current(int $index = 0, mixed $default = null): mixed;
+    public function current(int $index = 0, mixed $default = null);
 }

src/Contract/Operation/Findable.php

@@ -23,5 +23,5 @@ interface Findable
      *
      * @return T|V
      */
-    public function find(mixed $default = null, callable ...$callbacks): mixed;
+    public function find(mixed $default = null, callable ...$callbacks);
 }

src/Contract/Operation/Firstable.php

@@ -23,5 +23,5 @@ interface Firstable
      *
      * @return T|V
      */
-    public function first(mixed $default = null): mixed;
+    public function first(mixed $default = null);
 }

src/Contract/Operation/Getable.php

@@ -24,5 +24,5 @@ interface Getable
      *
      * @return T|V
      */
-    public function get(mixed $key, mixed $default = null): mixed;
+    public function get(mixed $key, mixed $default = null);
 }

src/Contract/Operation/Headable.php

@@ -23,5 +23,5 @@ interface Headable
      *
      * @return T|V
      */
-    public function head(mixed $default = null): mixed;
+    public function head(mixed $default = null);
 }

src/Contract/Operation/Keyable.php

@@ -17,5 +17,5 @@ interface Keyable
      *
      * @return TKey|null
      */
-    public function key(int $index = 0): mixed;
+    public function key(int $index = 0);
 }

src/Contract/Operation/Lastable.php

@@ -23,5 +23,5 @@ interface Lastable
      *
      * @return T|V
      */
-    public function last(mixed $default = null): mixed;
+    public function last(mixed $default = null);
 }

src/Contract/Operation/Maxable.php

@@ -28,5 +28,5 @@ interface Maxable
      *
      * @return T|V
      */
-    public function max(mixed $default = null): mixed;
+    public function max(mixed $default = null);
 }

src/Contract/Operation/Minable.php

@@ -28,5 +28,5 @@ interface Minable
      *
      * @return T|V
      */
-    public function min(mixed $default = null): mixed;
+    public function min(mixed $default = null);
 }

src/Contract/Operation/Prependable.php

@@ -17,7 +17,11 @@ interface Prependable
      *
      * @see https://loophp-collection.readthedocs.io/en/stable/pages/api.html#prepend
      *
-     * @return Collection<int|TKey, T>
+     * @template U
+     *
+     * @param U ...$items
+     *
+     * @return Collection<int|TKey, T|U>
      */
     public function prepend(mixed ...$items): Collection;
 }

src/Contract/Operation/Unpackable.php

@@ -17,7 +17,7 @@ interface Unpackable
      *
      * @see https://loophp-collection.readthedocs.io/en/stable/pages/api.html#unpack
      *
-     * @return Collection<mixed, mixed>
+     * @return Collection<TKey, T>
      */
     public function unpack(): Collection;
 }