Skip to content

Commit 55623c9

Browse files
committed
Use newer Promise API instead of Promise helpers
1 parent 8efb578 commit 55623c9

3 files changed

Lines changed: 4 additions & 19 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"php": ">=5.3",
1818
"react/event-loop": "~0.3.0|~0.4.0",
1919
"clue/buzz-react": "~0.3.0",
20-
"react/promise": "~1.0|~2.0",
20+
"react/promise": "~2.0|~1.1",
2121
"clue/json-stream": "~0.1.0"
2222
},
2323
"require-dev": {

tests/Io/StreamingParserTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use React\Promise\Deferred;
55
use React\Stream\ReadableStream;
66
use React\Promise\CancellablePromiseInterface;
7+
use React\Promise;
78

89
class StreamingParserTest extends TestCase
910
{
@@ -16,7 +17,7 @@ public function setUp()
1617

1718
public function testJsonPassingRejectedPromiseResolvesWithClosedStream()
1819
{
19-
$stream = $this->parser->parseJsonStream($this->createPromiseRejected());
20+
$stream = $this->parser->parseJsonStream(Promise\reject());
2021

2122
$this->assertInstanceOf('React\Stream\ReadableStreamInterface', $stream);
2223
$this->assertFalse($stream->isReadable());
@@ -58,7 +59,7 @@ public function testJsonResolvingPromiseWillEmitCloseEvent()
5859

5960
public function testPlainPassingRejectedPromiseResolvesWithClosedStream()
6061
{
61-
$stream = $this->parser->parsePlainStream($this->createPromiseRejected());
62+
$stream = $this->parser->parsePlainStream(Promise\reject());
6263

6364
$this->assertInstanceOf('React\Stream\ReadableStreamInterface', $stream);
6465
$this->assertFalse($stream->isReadable());

tests/bootstrap.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,6 @@ protected function waitFor(PromiseInterface $promise, LoopInterface $loop)
106106

107107
return $resolved;
108108
}
109-
110-
protected function createPromiseResolved($value = null)
111-
{
112-
$deferred = new Deferred();
113-
$deferred->resolve($value);
114-
115-
return $deferred->promise();
116-
}
117-
118-
protected function createPromiseRejected($value = null)
119-
{
120-
$deferred = new Deferred();
121-
$deferred->reject($value);
122-
123-
return $deferred->promise();
124-
}
125109
}
126110

127111
class CallableStub

0 commit comments

Comments
 (0)