Allow all iterables in IterableValue join method (#16)

gowork · Jan 9, 2019 · 58dd754 · 58dd754
1 parent c492612
commit 58dd754
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/docs/examples.md b/docs/examples.md
@@ -3479,7 +3479,7 @@ public function flatMap(callable $transformer);
 /**
  * @return IterableValue
  */
-public function join(IterableValue $other);
+public function join(iterable $other);
 ```
 
 #### Examples
@@ -3498,7 +3498,7 @@ $range = function (int $start, int $end) {
 $one = Wrap::iterable($range(1, 3));
 $two = Wrap::iterable($range(8, 10));
 
-var_export($one->join($two)->toArray());
+var_export($one->join($two)->join($range(11, 14))->toArray());
 ```
 
 ```
@@ -3509,6 +3509,10 @@ array (
   3 => 8,
   4 => 9,
   5 => 10,
+  6 => 11,
+  7 => 12,
+  8 => 13,
+  9 => 14,
 )
 ```
 

diff --git a/examples/example/IterableValue-join.php b/examples/example/IterableValue-join.php
@@ -11,4 +11,4 @@
 $one = Wrap::iterable($range(1, 3));
 $two = Wrap::iterable($range(8, 10));
 
-var_export($one->join($two)->toArray());
+var_export($one->join($two)->join($range(11, 14))->toArray());
diff --git a/spec/InfiniteIterableValueSpec.php b/spec/InfiniteIterableValueSpec.php
@@ -160,7 +160,17 @@ function it_can_call_some_action_on_each_item(CallableMock $callable)
         $callable->__invoke('item 3')->shouldHaveBeenCalled();
     }
 
-    function it_joins_with_other_array()
+    function it_joins_with_other_iterable()
+    {
+        $this->beConstructedWith(['a 1', 'a 2', 'a 3']);
+
+        $joined = $this->join(['b 1', 'b 2', 'b 3']);
+
+        $joined->shouldNotBe($this);
+        $joined->toArray()->shouldBeLike(['a 1', 'a 2', 'a 3', 'b 1', 'b 2', 'b 3']);
+    }
+
+    function it_joins_with_other_IterableValue()
     {
         $this->beConstructedWith(['a 1', 'a 2', 'a 3']);
 

diff --git a/src/InfiniteIterableValue.php b/src/InfiniteIterableValue.php
@@ -160,7 +160,7 @@ public function push($value)
     /**
      * @return IterableValue
      */
-    public function join(IterableValue $other)
+    public function join(iterable $other)
     {
         $clone = clone $this;
         $clone->stack = $clone->stack->push(function (iterable $iterable) use ($other) {

diff --git a/src/IterableValue.php b/src/IterableValue.php
@@ -38,7 +38,7 @@ public function flatMap(callable $transformer);
     /**
      * @return IterableValue
      */
-    public function join(IterableValue $other);
+    public function join(iterable $other);
 
     /**
      * @return IterableValue