flush

[m6w6/seekat] / lib / API / Call.php

diff --git a/lib/API/Call.php b/lib/API/Call.php
index d84a24c673f71e438d2a5bb60cb14fceb28124aa..7eba2a80b7fbfb76f6b7748c728c06797410c357 100644 (file)
--- a/lib/API/Call.php
+++ b/lib/API/Call.php
@@ -2,12 +2,12 @@
 
 namespace seekat\API;
 
+use AsyncInterop\Promise;
 use http\Url;
-use React\Promise\ExtendedPromiseInterface;
 use seekat\API;
 use seekat\Exception;
 
-class Call
+final class Call
 {
        /**
         * @var API
@@ -24,24 +24,12 @@ class Call
                $this->call = $call;
        }
 
-       function __invoke(array $args) : ExtendedPromiseInterface {
-               $promise = $this->api->{$this->call}->get(...$args);
-
-               /* fetch resource, unless already localized, and try for {$method}_url */
-               if (!$this->api->exists($this->call)) {
-                       $promise = $promise->otherwise(function ($error) use($args) {
-                               if ($this->api->exists($this->call."_url", $url)) {
-                                       $url = new Url(uri_template($url, (array)current($args)));
-                                       return $this->api->withUrl($url)->get(...$args);
-                               }
-
-                               $message = Exception\message($error);
-                               $this->api->getLogger()->error("call($this->call): " . $message, [
-                                       "url" => (string) $this->api->getUrl()
-                               ]);
-
-                               throw $error;
-                       });
+       function __invoke(array $args) : Promise {
+               if ($this->api->exists($this->call."_url", $url)) {
+                       $url = new Url(uri_template($url, (array)current($args)));
+                       $promise = $this->api->withUrl($url)->get(...$args);
+               } else {
+                       $promise = $this->api->{$this->call}->get(...$args);
                }
 
                return $promise;