danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2024-11-27 04:24:42 +01:00
Code Issues Projects Releases Wiki Activity

Remove custom coroutine promisifier support

Browse Source
This commit is contained in:
Daniel Lowrey 2015-06-15 17:53:58 -04:00
parent f06f803e76
commit 1d777c7e3e
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/functions.php
View File

@ -523,14 +523,13 @@ function wait(Promise $promise, Reactor $reactor = null) {
*
* @param callable $func The callable to be wrapped for coroutine resolution
* @param \Amp\Reactor $reactor
* @param callable $promisifier
* @return callable Returns the wrapped callable
*/
function coroutine(callable $func, Reactor $reactor = null, callable $promisifier = null) {
return function() use ($func, $reactor, $promisifier) {
function coroutine(callable $func, Reactor $reactor = null) {
return function() use ($func, $reactor) {
$result = \call_user_func_array($func, func_get_args());
return ($result instanceof \Generator)
? resolve($result, $reactor, $promisifier)
? resolve($result, $reactor)
: $result;
};
}
@ -543,14 +542,12 @@ function coroutine(callable $func, Reactor $reactor = null, callable $promisifie
*
* @param \Generator $generator The generator to resolve as a coroutine
* @param \Amp\Reactor $reactor
* @param callable $promisifier
*/
function resolve(\Generator $generator, Reactor $reactor = null, callable $promisifier = null) {
function resolve(\Generator $generator, Reactor $reactor = null) {
$cs = new \StdClass;
$cs->reactor = $reactor ?: reactor();
$cs->promisor = new Deferred;
$cs->generator = $generator;
$cs->promisifier = $promisifier;
$cs->returnValue = null;
$cs->currentPromise = null;
$cs->isResolved = false;
@ -579,9 +576,6 @@ function __coroutineAdvance($cs) {
} elseif ($yielded instanceof Promise) {
$cs->currentPromise = $yielded;
$cs->reactor->immediately("Amp\__coroutineNextTick", ["cb_data" => $cs]);
} elseif ($cs->promisifier) {
__coroutineCustomPromisify($cs, $key, $yielded);
$cs->reactor->immediately("Amp\__coroutineNextTick", ["cb_data" => $cs]);
} else {
$cs->isResolved = true;
$cs->promisor->fail(new \DomainException(
@ -598,20 +592,6 @@ function __coroutineAdvance($cs) {
}
}
function __coroutineCustomPromisify($cs, $key, $yielded) {
$promise = \call_user_func($cs->promisifier, $cs->generator, $key, $yielded);
if ($promise instanceof Promise) {
$cs->currentPromise = $promise;
} elseif ($promise instanceof \Generator) {
$cs->currentPromise = resolve($promise, $cs->reactor, $cs->promisifier);
} else {
throw new \DomainException(sprintf(
"Invalid promisifier yield of type %s; Promise|null expected",
is_object($promise) ? get_class($promise) : gettype($promise)
));
}
}
function __coroutineNextTick($reactor, $watcherId, $cs) {
if ($promise = $cs->currentPromise) {
$cs->currentPromise = null;
@ -639,7 +619,7 @@ function __coroutineSend($error, $result, $cs) {
}
}
function __coroutineYieldError(\Generator $generator, $key, $yielded) {
function __coroutineYieldError($generator, $key, $yielded) {
$type = is_object($yielded) ? get_class($yielded) : gettype($yielded);
$msg = "Unexpected Generator yield (Promise|\"return\"|null expected); {$type} yielded at key {$key}";
if (PHP_MAJOR_VERSION < 7) {