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

Replace more occurrences of stream

Browse Source
This commit is contained in:
Aaron Piotrowski 2017-04-28 00:51:59 -05:00 committed by Niklas Keller
parent f78328822c
commit 91c8da9fec
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Internal/Producer.php
View File

@ -68,7 +68,7 @@ trait Producer {
*/
public function getCurrent() {
if (empty($this->values) && $this->complete) {
throw new \Error("The stream has completed");
throw new \Error("The iterator has completed");
}
if (!\array_key_exists($this->position, $this->values)) {
@ -79,18 +79,18 @@ trait Producer {
}
/**
* Emits a value from the stream. The returned promise is resolved with the emitted value once all listeners
* Emits a value from the iterator. The returned promise is resolved with the emitted value once all listeners
* have been invoked.
*
* @param mixed $value
*
* @return \Amp\Promise
*
* @throws \Error If the stream has completed.
* @throws \Error If the iterator has completed.
*/
private function emit($value): Promise {
if ($this->complete) {
throw new \Error("Streams cannot emit values after calling complete");
throw new \Error("Iterators cannot emit values after calling complete");
}
if ($value instanceof ReactPromise) {
@ -102,7 +102,7 @@ trait Producer {
$value->onResolve(function ($e, $v) use ($deferred) {
if ($this->complete) {
$deferred->fail(
new \Error("The stream was completed before the promise result could be emitted")
new \Error("The iterator was completed before the promise result could be emitted")
);
return;
}
@ -134,7 +134,7 @@ trait Producer {
/**
* Completes the iterator.
*
* @throws \Error If the stream has already been completed.
* @throws \Error If the iterator has already been completed.
*/
private function complete() {
if ($this->complete) {

6
test/ProducerTraitTest.php
View File

@ -134,7 +134,7 @@ class ProducerTraitTest extends TestCase {
/**
* @depends testEmit
* @expectedException \Error
* @expectedExceptionMessage Streams cannot emit values after calling complete
* @expectedExceptionMessage Iterators cannot emit values after calling complete
*/
public function testEmitAfterComplete() {
$this->producer->complete();
@ -144,7 +144,7 @@ class ProducerTraitTest extends TestCase {
/**
* @depends testEmit
* @expectedException \Error
* @expectedExceptionMessage The stream was completed before the promise result could be emitted
* @expectedExceptionMessage The iterator was completed before the promise result could be emitted
*/
public function testEmitPendingPromiseThenComplete() {
$invoked = false;
@ -167,7 +167,7 @@ class ProducerTraitTest extends TestCase {
/**
* @depends testEmit
* @expectedException \Error
* @expectedExceptionMessage The stream was completed before the promise result could be emitted
* @expectedExceptionMessage The iterator was completed before the promise result could be emitted
*/
public function testEmitPendingPromiseThenFail() {
$invoked = false;