github: fix notices

[pharext/pharext.org] / app / Github / API / Call.php

diff --git a/app/Github/API/Call.php b/app/Github/API/Call.php
index d4afd19eeb3c375408162728293622a2f2e2b12c..21fd45f016fb808802531baa5113baa37dc3ef40 100644 (file)
--- a/app/Github/API/Call.php
+++ b/app/Github/API/Call.php
@@ -4,10 +4,13 @@ namespace app\Github\API;
 
 use app\Github\API;
 use app\Github\Storage\Item;
+use http\Client\Response;
 use http\QueryString;
 use http\Url;
 use merry\Config;
 
+use React\Promise;
+
 abstract class Call
 {
        /**
@@ -36,9 +39,19 @@ abstract class Call
        protected $query;
        
        /**
-        * Queue this call to the API client
+        * @var \React\Promise\Deferred
+        */
+       protected $deferred;
+       
+       /**
+        * @return Request
         */
-       abstract function enqueue(callable $callback);
+       abstract protected function request();
+       
+       /**
+        * @return array
+        */
+       abstract protected function response(Response $response);
        
        /**
         * @param API $api
@@ -48,6 +61,7 @@ abstract class Call
                $this->api = $api;
                $this->config = $this->api->getConfig();
                $this->url = new Url($this->config->api->url, null, 0);
+               $this->deferred = new Promise\Deferred;
                
                if ($args) {
                        $this->args = $args;
@@ -57,13 +71,29 @@ abstract class Call
                }
        }
        
-       function __invoke(callable $callback) {
-               if ($this->readFromCache($cached)) {
-                       call_user_func_array($callback, $cached);
+       /**
+        * @return \React\Promise\Promise
+        */
+       function __invoke() {
+               if ($this->readFromCache($this->result)) {
+                       return new Promise\FulfilledPromise($this->result);
                } else {
-                       $this->enqueue($callback);
+                       $this->api->getClient()->enqueue(
+                               $this->request(),
+                               function($response) {
+                                       try {
+                                               $result = $this->response($response);
+                                               if (!($result instanceof Promise\PromiseInterface)) {
+                                                       $this->deferred->resolve($result);
+                                               }
+                                       } catch (\Exception $e) {
+                                               $this->deferred->reject($e);
+                                       }
+                                       return true;
+                               }
+                       );
+                       return $this->deferred->promise();
                }
-               return $this;
        }
        
        /**
@@ -75,13 +105,6 @@ abstract class Call
                return strtolower(end($parts));
        }
        
-       /**
-        * Call Client::send()
-        */
-       function send() {
-               return $this->api->getClient()->send();
-       }
-       
        /**
         * Get associated cache storage
         * @param int $ttl out param of configure ttl
@@ -116,9 +139,17 @@ abstract class Call
                        return false;
                }
                if (!$cache->get($key, $cached)) {
+                       if ($cached) {
+                               $this->api->getLogger()->debug(
+                                       sprintf("Cache-Stale: $this [TTL=%d]", $cached->getTTL()),
+                                       $this->args);
+                       } else {
+                               $this->api->getLogger()->debug("Cache-Miss: $this", $this->args);
+                       }
                        return false;
                }
                if (null !== $this->api->getMaxAge() && $cached->getAge() > $this->api->getMaxAge()) {
+                       $this->api->getLogger()->debug("Cache-Refresh: $this", $this->args);
                        return false;
                }
                $this->api->getLogger()->debug("Cache-Hit: $this", $this->args);
@@ -136,6 +167,7 @@ abstract class Call
                        
                        $key = $this->getCacheKey();
                        $cache->set($key, new Item($fresh, $ttl));
+                       $this->api->getLogger()->debug("Cache-Push: $this", $this->args);
                }
        }
        
@@ -143,6 +175,7 @@ abstract class Call
                if (($cache = $this->api->getCacheStorage())) {
                        $key = $this->getCacheKey();
                        $cache->del($key);
+                       $this->api->getLogger()->debug("Cache-Drop: $this", $this->args);
                }
        }
 }