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

Rename Observer::next to Observer::advance

Browse Source
This commit is contained in:
Niklas Keller 2016-12-13 20:37:51 +01:00
parent 1299e51ca6
commit 1bbcadaedd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/emitter.php
View File

@ -28,7 +28,7 @@ Amp\execute(function () {
$generator = function (Observable $observable) {
$observer = new Observer($observable);
while (yield $observer->next()) {
while (yield $observer->advance()) {
printf("Observable emitted %d\n", $observer->getCurrent());
yield new Pause(100); // Observer consumption takes 100 ms.
}

2
example/postponed.php
View File

@ -34,7 +34,7 @@ Amp\execute(function () {
$generator = function (Observable $observable) {
$observer = new Observer($observable);
while (yield $observer->next()) {
while (yield $observer->advance()) {
printf("Observable emitted %d\n", $observer->getCurrent());
yield new Pause(100); // Observer consumption takes 100 ms.
}

8
lib/Observer.php
View File

@ -9,7 +9,7 @@ use Interop\Async\Promise;
*
* Example:
* $observer = new Observer($observable); // $observable is an instance of \Amp\Observable
* while (yield $observer->next()) {
* while (yield $observer->advance()) {
* $emitted = $observer->getCurrent();
* }
* $result = $observer->getResult();
@ -113,7 +113,7 @@ class Observer {
*
* @return \Interop\Async\Promise<bool>
*/
public function next(): Promise {
public function advance(): Promise {
if (isset($this->deferreds[$this->position])) {
$future = $this->deferreds[$this->position];
unset($this->values[$this->position], $this->deferreds[$this->position]);
@ -145,7 +145,7 @@ class Observer {
*
* @return mixed Value emitted from observable.
*
* @throws \Error If the observable has resolved or next() was not called before calling this method.
* @throws \Error If the observable has resolved or advance() was not called before calling this method.
*/
public function getCurrent() {
if (empty($this->values) && $this->resolved) {
@ -153,7 +153,7 @@ class Observer {
}
if (!\array_key_exists($this->position, $this->values)) {
throw new \Error("Promise returned from next() must resolve before calling this method");
throw new \Error("Promise returned from advance() must resolve before calling this method");
}
return $this->values[$this->position];