refactored 80%

[pharext/pharext.org] / app / Github / API / Repos / ReadContents.php

diff --git a/app/Github/API/Repos/ReadContents.php b/app/Github/API/Repos/ReadContents.php
index 844df198209cb2aec4d091d0ea3f4d16a7dafd96..a812211767443ea39fcc56d9a1c4d40d3f411761 100644 (file)
--- a/app/Github/API/Repos/ReadContents.php
+++ b/app/Github/API/Repos/ReadContents.php
@@ -5,23 +5,25 @@ namespace app\Github\API\Repos;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class ReadContents extends Call
 {
-       function enqueue(callable $callback) {
+       function request() {
                $url = $this->url->mod(uri_template("./repos/{+repo}/contents/{+path}", $this->args));
                $request = new Request("GET", $url, [
                        "Authorization" => "token ". $this->api->getToken(),
                        "Accept" => $this->config->api->accept,
                ]);
-               $this->api->getClient()->enqueue($request, function($response) use($callback) {
-                       if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
-                               throw new RequestException($response);
-                       }
-                       $this->result = [$json];
-                       $this->saveToCache($this->result);
-                       $callback($json);
-                       return true;
-               });
+               return $request;
+       }
+       
+       function response(Response $response) {
+               if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
+                       throw new RequestException($response);
+               }
+               $result = [$json];
+               $this->saveToCache($result);
+               return $result;
        }
 }