From 2119817003b44c9bd1ccc0657ea1a735ad5362cb Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Thu, 4 Feb 2021 10:30:14 +0100
Subject: [PATCH] Chore: Add types to iterable() and IterableObject

---
 phpstan.neon.dist          |  7 +++++++
 psalm-baseline.xml         | 13 +++++++++++++
 psalm.xml.dist             |  1 +
 src/IterableObject.php     | 29 ++++++++++++++++++++---------
 src/iterable-functions.php |  7 ++++++-
 5 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 psalm-baseline.xml

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 8ea502f..7e29c96 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,3 +3,10 @@ parameters:
     paths:
         - %currentWorkingDirectory%/src
         - %currentWorkingDirectory%/tests
+
+    ignoreErrors:
+        # https://github.com/phpstan/phpstan/issues/4498
+        - '~Method BenTools\\IterableFunctions\\IterableObject::filter\(\) should return BenTools\\IterableFunctions\\IterableObject<TKey, TValue> but returns BenTools\\IterableFunctions\\IterableObject<int\|string, mixed>~'
+        - '~Method BenTools\\IterableFunctions\\IterableObject::map\(\) should return BenTools\\IterableFunctions\\IterableObject<TKey, TResult> but returns BenTools\\IterableFunctions\\IterableObject<int\|string, TResult>~'
+
+        - '~Function BenTools\\IterableFunctions\\iterable_map\(\) should return iterable<TKey, TResult> but returns array<TResult>\|BenTools\\IterableFunctions\\IterableObject<TKey, TResult>~'
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 0000000..555826d
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.5.1@257a1ca672a79dedc852be1285a7b97154646418">
+  <file src="src/iterable-functions.php">
+    <InvalidReturnStatement occurrences="2">
+      <code>is_array($iterable) ? $filtered-&gt;asArray() : $filtered</code>
+      <code>is_array($iterable) ? $mapped-&gt;asArray() : $mapped</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="2">
+      <code>iterable&lt;TKey, TResult&gt;</code>
+      <code>iterable&lt;TKey, TValue&gt;</code>
+    </InvalidReturnType>
+  </file>
+</files>
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 3e6a115..02ceeb4 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -3,6 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/src/IterableObject.php b/src/IterableObject.php
index 59cc296..b0e4796 100644
--- a/src/IterableObject.php
+++ b/src/IterableObject.php
@@ -16,21 +16,27 @@
 /**
  * @internal
  *
- * @implements IteratorAggregate<mixed>
+ * @template TKey
+ * @template TValue
+ *
+ * @implements IteratorAggregate<TKey, TValue>
  */
 final class IterableObject implements IteratorAggregate
 {
-    /** @var iterable<mixed> */
+    /** @var iterable<TKey, TValue> */
     private $iterable;
 
-    /**
-     * @param iterable<mixed> $iterable
-     */
+    /** @param iterable<TKey, TValue> $iterable */
     public function __construct(iterable $iterable)
     {
         $this->iterable = $iterable;
     }
 
+    /**
+     * @param (callable(TValue):bool)|null $filter
+     *
+     * @return self<TKey, TValue>
+     */
     public function filter(?callable $filter = null): self
     {
         if ($this->iterable instanceof Traversable) {
@@ -48,6 +54,13 @@ static function ($value): bool {
         return new self($filtered);
     }
 
+    /**
+     * @param callable(TValue):TResult $mapper
+     *
+     * @return self<TKey, TResult>
+     *
+     * @template TResult
+     */
     public function map(callable $mapper): self
     {
         if ($this->iterable instanceof Traversable) {
@@ -57,15 +70,13 @@ public function map(callable $mapper): self
         return new self(array_map($mapper, $this->iterable));
     }
 
-    /**
-     * @return Traversable<mixed>
-     */
+    /** @return Traversable<TKey, TValue> */
     public function getIterator(): Traversable
     {
         yield from $this->iterable;
     }
 
-    /** @return array<mixed> */
+    /** @return array<array-key, TValue> */
     public function asArray(): array
     {
         return $this->iterable instanceof Traversable ? iterator_to_array($this->iterable) : $this->iterable;
diff --git a/src/iterable-functions.php b/src/iterable-functions.php
index e244236..f7f379c 100644
--- a/src/iterable-functions.php
+++ b/src/iterable-functions.php
@@ -115,7 +115,12 @@ function iterable_reduce(iterable $iterable, callable $reduce, $initial = null)
 }
 
 /**
- * @param iterable<mixed> $iterable
+ * @param iterable<TKey, TValue>|null $iterable
+ *
+ * @return IterableObject<TKey, TValue>
+ *
+ * @template TKey
+ * @template TValue
  */
 function iterable(?iterable $iterable): IterableObject
 {