X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2FGithub%2FAPI%2FHooks%2FUpdateHook.php;h=f03010770be115da3358b1d8e6ce0212b9ece5a7;hb=ee3977104c9ea0984c76f75f965c528bc4b3b64e;hp=cd249bad2b7bb544fbfaf147566af44bb28926cd;hpb=a2af03951ac7fbd032609d0044c0a85704b77771;p=pharext%2Fpharext.org

diff --git a/app/Github/API/Hooks/UpdateHook.php b/app/Github/API/Hooks/UpdateHook.php
index cd249ba..f030107 100644
--- a/app/Github/API/Hooks/UpdateHook.php
+++ b/app/Github/API/Hooks/UpdateHook.php
@@ -2,11 +2,16 @@
 
 namespace app\Github\API\Hooks;
 
-class UpdateHook extends \app\Github\API\Call
+use app\Github\API\Call;
+use app\Github\Exception\RequestException;
+use http\Client\Request;
+use http\Client\Response;
+
+class UpdateHook extends Call
 {
-	function enqueue(callable $callback) {
+	function request() {
 		$url = $this->url->mod(uri_template("./repos/{+repo}/hooks{/id}", $this->args));
-		$request = new \http\Client\Request("PATCH", $url, [
+		$request = new Request("PATCH", $url, [
 			"Authorization" => "token ". $this->api->getToken(),
 			"Accept" => $this->config->api->accept,
 			"Content-Type" => "application/json",
@@ -19,14 +24,23 @@ class UpdateHook extends \app\Github\API\Call
 		if (!empty($this->args["conf"]["release"])) {
 			$events[] = "release";
 		}
-		
-		$request->getBody()->append(json_encode(compact("events")));
-		$this->api->getClient()->enqueue($request, function($response) use($callback) {
-			if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
-				throw new \app\Github\Exception\RequestException($response);
-			}
-			$callback($json);
-			return true;
-		});
+		$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,
+			"secret" => $this->config->client->secret, // FIXME: bad idea?
+		];
+
+		$request->getBody()->append(json_encode(compact("events", "config")));
+		return $request;
+	}
+	
+	function response(Response $response) {
+		if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
+			throw new RequestException($response);
+		}
+		return [$json];
 	}
 }