promise refactoring++

[pharext/pharext.org] / app / Github / API / Hooks / CreateHook.php

diff --git a/app/Github/API/Hooks/CreateHook.php b/app/Github/API/Hooks/CreateHook.php
index 866e93964236bdd12bccdb95c2025d5db3368553..0d36ad66a621c32475b264bc2736f679e5dd8cd1 100644 (file)
--- a/app/Github/API/Hooks/CreateHook.php
+++ b/app/Github/API/Hooks/CreateHook.php
@@ -5,10 +5,11 @@ namespace app\Github\API\Hooks;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class CreateHook extends Call
 {
-       function enqueue(callable $callback) {
+       function request() {
                $url = $this->url->mod("./repos/". $this->args["repo"] ."/hooks");
                $request = new Request("POST", $url, [
                        "Authorization" => "token " . $this->api->getToken(),
@@ -28,6 +29,8 @@ class CreateHook extends Call
                        "name" => "web",
                        "events" => $events,
                        "config" => [
+                               "zend" => (int)!empty($this->args["conf"]["zend"]),
+                               "pecl" => (int)!empty($this->args["conf"]["pecl"]),
                                "url" => $this->config->hook->url,
                                "content_type" => $this->config->hook->content_type,
                                "insecure_ssl" => $this->config->hook->insecure_ssl,
@@ -35,12 +38,13 @@ class CreateHook extends Call
                        ]
                ]));
                
-               $this->api->getClient()->enqueue($request, function($response) use($callback) {
-                       if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
-                               throw new RequestException($response);
-                       }
-                       $callback($json);
-                       return true;
-               });
+               return $request;
+       }
+       
+       function response(Response $response) {
+               if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
+                       throw new RequestException($response);
+               }
+               return [$json];
        }
 }