Merge pull request #13 from clue-labs/all-args

Fix `all()` to assume null values if no event data is passed
reactphp · Dec 22, 2017 · 3bc2c27 · 3bc2c27
2 parents 3c9018d + 04a8528
commit 3bc2c27
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/functions.php b/src/functions.php
@@ -125,7 +125,7 @@ function all(EventEmitterInterface $stream, $event = 'data')
     }
 
     $buffer = array();
-    $bufferer = function ($data) use (&$buffer) {
+    $bufferer = function ($data = null) use (&$buffer) {
         $buffer []= $data;
     };
     $stream->on($event, $bufferer);

diff --git a/tests/AllTest.php b/tests/AllTest.php
@@ -68,6 +68,19 @@ public function testEmittingDataOnStreamResolvesWithArrayOfData()
         $this->expectPromiseResolveWith(array('hello', 'world'), $promise);
     }
 
+    public function testEmittingCustomEventOnStreamResolvesWithArrayOfCustomEventData()
+    {
+        $stream = new ThroughStream();
+        $promise = Stream\all($stream, 'a');
+
+        $stream->emit('a', array('hello'));
+        $stream->emit('b', array('ignored'));
+        $stream->emit('a');
+        $stream->close();
+
+        $this->expectPromiseResolveWith(array('hello', null), $promise);
+    }
+
     public function testEmittingErrorOnStreamRejects()
     {
         $stream = new ThroughStream();