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

Cleaner resolution

Browse Source
This commit is contained in:
Aaron Piotrowski 2016-06-16 23:27:14 -05:00
parent 92767755ee
commit 4ed8e65468
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/Internal/Placeholder.php
View File

@ -54,12 +54,14 @@ trait Placeholder {
if (null === $this->onResolved) { if (null === $this->onResolved) {
$this->onResolved = $onResolved; $this->onResolved = $onResolved;
} elseif (!$this->onResolved instanceof WhenQueue) { return;
$this->onResolved = new WhenQueue($this->onResolved);
$this->onResolved->push($onResolved);
} else {
$this->onResolved->push($onResolved);
} }
if (!$this->onResolved instanceof WhenQueue) {
$this->onResolved = new WhenQueue($this->onResolved);
}
$this->onResolved->push($onResolved);
} }
/** /**
@ -73,25 +75,28 @@ trait Placeholder {
$this->resolved = true; $this->resolved = true;
$this->result = $value; $this->result = $value;
if ($this->onResolved !== null) { if ($this->onResolved === null) {
if ($this->result instanceof Awaitable) { return;
$this->result->when($this->onResolved); }
} else {
try {
$onResolved = $this->onResolved;
$onResolved(null, $this->result);
} catch (\Throwable $exception) {
Loop::defer(static function () use ($exception) {
throw $exception;
});
} catch (\Exception $exception) {
Loop::defer(static function () use ($exception) {
throw $exception;
});
}
}
$this->onResolved = null; $onResolved = $this->onResolved;
$this->onResolved = null;
if ($this->result instanceof Awaitable) {
$this->result->when($onResolved);
return;
}
try {
$onResolved(null, $this->result);
} catch (\Throwable $exception) {
Loop::defer(static function () use ($exception) {
throw $exception;
});
} catch (\Exception $exception) {
Loop::defer(static function () use ($exception) {
throw $exception;
});
} }
} }