Skip to content

Commit 7c9a6ec

Browse files
WyriHaximusclue
authored andcommitted
Use Stream\first() instead of wrapping our own promise around it
1 parent 328fe95 commit 7c9a6ec

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"react/stream": "^1.0 || ^0.7.1",
1111
"react/promise": "^2.3 || ^1.2.1",
1212
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
13-
"react/promise-stream": "^1.0 || ^0.1.2"
13+
"react/promise-stream": "^1.1"
1414
},
1515
"autoload": {
1616
"psr-4": {

src/Middleware/RequestBodyBufferMiddleware.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use OverflowException;
66
use Psr\Http\Message\ServerRequestInterface;
7-
use React\Promise\Promise;
87
use React\Promise\Stream;
98
use React\Stream\ReadableStreamInterface;
109
use RingCentral\Psr7\BufferStream;
@@ -53,13 +52,8 @@ public function __invoke(ServerRequestInterface $request, $stack)
5352
// but ignore the contents and wait for the close event
5453
// before passing the request on to the next middleware.
5554
if ($error instanceof OverflowException) {
56-
return new Promise(function ($resolve, $reject) use ($stack, $request, $body) {
57-
$body->on('error', function ($error) use ($reject) {
58-
$reject($error);
59-
});
60-
$body->on('close', function () use ($stack, $request, $resolve) {
61-
$resolve($stack($request));
62-
});
55+
return Stream\first($body, 'close')->then(function () use ($stack, $request) {
56+
return $stack($request);
6357
});
6458
}
6559

0 commit comments

Comments
 (0)