Skip to content

Commit c835b28

Browse files
committed
react/stream 0.5 compatibility
1 parent 48ee7c9 commit c835b28

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
},
1717
"require": {
1818
"php": ">=5.3",
19-
"react/stream": "^0.4 || ^0.3",
19+
"react/stream": "^0.5 || ^0.4 || ^0.3",
2020
"react/promise": "^2.1 || ^1.2"
2121
},
2222
"require-dev": {
23-
"react/event-loop": "^0.4 || ^0.3",
23+
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
2424
"react/promise-timer": "^1.0",
2525
"clue/block-react": "^1.0",
2626
"phpunit/phpunit": "^4.8"

src/functions.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Creates a `Promise` which resolves with the stream data buffer
1313
*
1414
* @param ReadableStreamInterface $stream
15-
* @return CancellablePromiseInterface Promise<string, Exception>
15+
* @return Promise\CancellablePromiseInterface Promise<string, Exception>
1616
*/
1717
function buffer(ReadableStreamInterface $stream)
1818
{
@@ -53,7 +53,7 @@ function buffer(ReadableStreamInterface $stream)
5353
*
5454
* @param ReadableStreamInterface|WritableStreamInterface $stream
5555
* @param string $event
56-
* @return CancellablePromiseInterface Promise<mixed, Exception>
56+
* @return Promise\CancellablePromiseInterface Promise<mixed, Exception>
5757
*/
5858
function first(EventEmitterInterface $stream, $event = 'data')
5959
{
@@ -71,7 +71,7 @@ function first(EventEmitterInterface $stream, $event = 'data')
7171
}
7272

7373
return new Promise\Promise(function ($resolve, $reject) use ($stream, $event, &$listener) {
74-
$listener = function ($data) use ($stream, $event, &$listener, $resolve) {
74+
$listener = function ($data = null) use ($stream, $event, &$listener, $resolve) {
7575
$stream->removeListener($event, $listener);
7676
$resolve($data);
7777
};
@@ -92,7 +92,7 @@ function first(EventEmitterInterface $stream, $event = 'data')
9292
*
9393
* @param ReadableStreamInterface|WritableStreamInterface $stream
9494
* @param string $event
95-
* @return CancellablePromiseInterface Promise<string, Exception>
95+
* @return Promise\CancellablePromiseInterface Promise<string, Exception>
9696
*/
9797
function all(EventEmitterInterface $stream, $event = 'data')
9898
{

0 commit comments

Comments
 (0)