danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2024-11-26 20:15:00 +01:00
Code Issues Projects Releases Wiki Activity

Emitter::resolve → Emitter::complete

Browse Source
This commit is contained in:
Aaron Piotrowski 2017-04-26 13:14:10 -05:00 committed by Niklas Keller
parent 7e6eb3689e
commit a096a36f9a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Emitter.php
View File

@ -7,8 +7,8 @@ try {
if (!@\assert(false)) {
development: // PHP 7 development (zend.assertions=1)
/**
* Deferred is a container for a stream that can emit values using the emit() method and resolved using the
* resolve() and fail() methods of this object. The contained stream may be accessed using the stream() method.
* Deferred is a container for a stream that can emit values using the emit() method and completed using the
* complete() and fail() methods of this object. The contained stream may be accessed using the stream() method.
* This object should not be part of a public API, but used internally to create and emit values from a stream.
*/
final class Emitter {
@ -25,7 +25,7 @@ try {
/**
* @var callable
*/
private $resolve;
private $complete;
/**
* @var callable
@ -34,9 +34,9 @@ try {
public function __construct() {
$this->stream = new Internal\PrivateStream(
function (callable $emit, callable $resolve, callable $fail) {
function (callable $emit, callable $complete, callable $fail) {
$this->emit = $emit;
$this->resolve = $resolve;
$this->complete = $complete;
$this->fail = $fail;
}
);
@ -61,12 +61,10 @@ try {
}
/**
* Resolves the stream with the given value.
*
* @param mixed $value
* Completes the stream.
*/
public function resolve($value = null) {
($this->resolve)($value);
public function complete() {
($this->complete)();
}
/**
@ -86,7 +84,7 @@ try {
*/
eval('namespace Amp;
final class Emitter implements Stream {
use Internal\Producer { emit as public; resolve as public; fail as public; }
use Internal\Producer { emit as public; complete as public; fail as public; }
public function stream(): Stream { return $this; }
}');
}

6
lib/functions.php
View File

@ -579,7 +579,7 @@ namespace Amp\Stream {
$emitter->fail($exception);
$emitter = null;
} else {
$emitter->resolve();
$emitter->complete();
}
});
@ -638,13 +638,13 @@ namespace Amp\Stream {
$promise = Promise\all($previous);
}
$promise->onResolve(function ($exception, array $values = null) use ($emitter) {
$promise->onResolve(function ($exception) use ($emitter) {
if ($exception) {
$emitter->fail($exception);
return;
}
$emitter->resolve($values);
$emitter->complete();
});
return $emitter->stream();