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

Don't use php7 ReflectionGenerator in PHP5.x branch

Browse Source
This commit is contained in:
Daniel Lowrey 2015-05-20 18:19:23 -04:00
parent e6f1386b31
commit 0255049bbb
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/functions.php
View File

@ -538,9 +538,10 @@ function __coroutineAdvance($cs) {
} else { } else {
$promisor = $cs->promisor; $promisor = $cs->promisor;
$cs->promisor = null; $cs->promisor = null;
$promisor->fail(new \DomainException( $promisor->fail(new \DomainException(sprintf(
__generateYieldError($cs->generator, $key, $yielded) "Unexpected Generator yield (Promise|null expected); %s yielded at key %s",
)); is_object($yielded) ? get_class($yielded) : gettype($yielded)
)));
return; return;
} }
@ -580,19 +581,3 @@ function __coroutineSend($error, $result, $cs) {
} }
} }
} }
function __generateYieldError(\Generator $generator, $key, $yielded) {
$reflectionGen = new \ReflectionGenerator($generator);
$executingGen = $reflectionGen->getExecutingGenerator();
if ($isSubgenerator = ($executingGen !== $generator)) {
$reflectionGen = new \ReflectionGenerator($executingGen);
}
return sprintf(
"Unexpected Generator yield (Promise|null expected); %s yielded at key %s on line %s in %s",
(is_object($yielded) ? get_class($yielded) : gettype($yielded)),
$key,
$reflectionGen->getExecutingLine(),
$reflectionGen->getExecutingFile()
);
}