From: Michael Wallner <mike@php.net>
Date: Tue, 9 Jun 2015 15:57:04 +0000 (+0200)
Subject: promise refactoring++
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ee3977104c9ea0984c76f75f965c528bc4b3b64e;p=pharext%2Fpharext.org

promise refactoring++
---

diff --git a/app/Controller/Github/RepoHook.php b/app/Controller/Github/RepoHook.php
index 39f6f1b..14d3d69 100644
--- a/app/Controller/Github/RepoHook.php
+++ b/app/Controller/Github/RepoHook.php
@@ -35,45 +35,52 @@ class RepoHook extends Github
 	
 	function addHook($owner, $repo) {
 		$hook_conf = $this->app->getRequest()->getForm();
-		$this->github->createRepoHook("$owner/$repo", $hook_conf, function($hook) use($owner, $repo) {
+		$this->github->createRepoHook("$owner/$repo", $hook_conf)->then(function($hook) use($owner, $repo) {
 			$call = new ListHooks($this->github, ["repo" => "$owner/$repo", "fresh" => true]);
-			$call(function($hooks, $links) use($owner, $repo, $call) {
-				$call->saveToCache([$hooks, $links]);
+			$this->github->queue($call)->then(function() use($owner, $repo) {
 				$this->redirectBack("$owner/$repo");
 			});
-		})->send();
+		});
+		$this->github->drain();
 	}
 	
 	function updateHook($owner, $repo) {
-		$this->github->readRepo("$owner/$repo", function($repo) {
-			$call = $this->github->listHooks($repo->full_name, function($hooks, $links) use($repo, &$call) {
-				$repo->hooks = $hooks;
+		$this->github->readRepo("$owner/$repo")->then(function($result) {
+			list($repo) = $result;
+			$call = new ListHooks($this->github, ["repo" => $repo->full_name]);
+			$this->github->queue($call)->then(function($result) use($repo, $call) {
+				list($repo->hooks) = $result;
 				if (($hook = $this->github->checkRepoHook($repo))) {
 					$hook_conf = $this->app->getRequest()->getForm();
-					$this->github->updateRepoHook($repo->full_name, $hook->id, $hook_conf, function($changed_hook) use($repo, $hook, $hooks, $links, &$call) {
+					$this->github->updateRepoHook($repo->full_name, $hook->id, $hook_conf)->then(function($hook_result) use($repo, $hook, $result, $call) {
+						list($changed_hook) = $hook_result;
 						foreach ($changed_hook as $key => $val) {
 							$hook->$key = $val;
 						}
-						$call->saveToCache([$hooks, $links]);
+						$call->saveToCache($result);
 						$this->redirectBack($repo->full_name);
 					});
 				}
 			});
-		})->send();
+		});
+		$this->github->drain();
 	}
 	
 	function delHook($owner, $repo) {
-		$this->github->readRepo("$owner/$repo", function($repo) {
-			$call = $this->github->listHooks($repo->full_name, function($hooks) use($repo, &$call) {
-				$repo->hooks = $hooks;
+		$this->github->readRepo("$owner/$repo")->then(function($result) {
+			list($repo) = $result;
+			$call = new ListHooks($this->github, ["repo" => $repo->full_name]);
+			$this->github->queue($call)->then(function($result) use($repo, $call) {
+				list($repo->hooks) = $result;
 				if (($hook = $this->github->checkRepoHook($repo))) {
-					$this->github->deleteRepoHook($repo->full_name, $hook->id, function() use($repo, &$call) {
+					$this->github->deleteRepoHook($repo->full_name, $hook->id)->then(function() use($repo, $call) {
 						$call->dropFromCache();
 						$this->redirectBack($repo->full_name);
 					});
 				}
 			});
-		})->send();
+		});
+		$this->github->drain();
 	}
 	
 	function redirectBack($repo) {
diff --git a/app/Github/API/Hooks/CreateHook.php b/app/Github/API/Hooks/CreateHook.php
index 146929b..0d36ad6 100644
--- 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(),
@@ -37,13 +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);
-			}
-			$this->result = [$json];
-			$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];
 	}
 }
diff --git a/app/Github/API/Hooks/DeleteHook.php b/app/Github/API/Hooks/DeleteHook.php
index a94f285..3635f6e 100644
--- a/app/Github/API/Hooks/DeleteHook.php
+++ b/app/Github/API/Hooks/DeleteHook.php
@@ -5,21 +5,22 @@ namespace app\Github\API\Hooks;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class DeleteHook extends Call
 {
-	function enqueue(callable $callback) {
+	function request() {
 		$url = $this->url->mod(uri_template("./repos/{+repo}/hooks{/id}", $this->args));
 		$request = new Request("DELETE", $url, [
 			"Authorization" => "token " . $this->api->getToken(),
 			"Accept" => $this->config->api->accept,
 		]);
-		$this->api->getClient()->enqueue($request, function($response) use($callback) {
-			if ($response->getResponseCode() >= 400) {
-				throw new RequestException($response);
-			}
-			$callback();
-			return true;
-		});
+		return $request;
+	}
+	
+	function response(Response $response) {
+		if ($response->getResponseCode() >= 400) {
+			throw new RequestException($response);
+		}
 	}
 }
diff --git a/app/Github/API/Hooks/UpdateHook.php b/app/Github/API/Hooks/UpdateHook.php
index 2d994b5..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",
@@ -29,13 +34,13 @@ class UpdateHook extends \app\Github\API\Call
 		];
 
 		$request->getBody()->append(json_encode(compact("events", "config")));
-		$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);
-			}
-			$this->result = [$json];
-			$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];
 	}
 }
diff --git a/app/Github/API/Releases/CreateRelease.php b/app/Github/API/Releases/CreateRelease.php
index 1cb2222..c7b1a4a 100644
--- a/app/Github/API/Releases/CreateRelease.php
+++ b/app/Github/API/Releases/CreateRelease.php
@@ -5,10 +5,11 @@ namespace app\Github\API\Releases;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class CreateRelease extends Call
 {
-	function enqueue(callable $callback) {
+	function request() {
 		$url = $this->url->mod("/repos/". $this->args["repo"] ."/releases");
 		$request = new Request("POST", $url, [
 			"Authorization" => "token ". $this->api->getToken(),
@@ -19,13 +20,13 @@ class CreateRelease extends Call
 			"tag_name" => $this->args["tag"],
 			"draft" => true,
 		]));
-		$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];
-			$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];
 	}
 }
diff --git a/app/Github/API/Releases/CreateReleaseAsset.php b/app/Github/API/Releases/CreateReleaseAsset.php
index 88b5a49..ce1ad36 100644
--- a/app/Github/API/Releases/CreateReleaseAsset.php
+++ b/app/Github/API/Releases/CreateReleaseAsset.php
@@ -5,24 +5,25 @@ namespace app\Github\API\Releases;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 use http\Message\Body;
 
 class CreateReleaseAsset extends Call
 {
-	function enqueue(callable $callback) {
+	function request() {
 		$body = new Body(fopen($this->args["asset"], "rb"));
 		$request = new Request("POST", $this->args["url"], [
 			"Authorization" => "token ". $this->api->getToken(),
 			"Accept" => $this->config->api->accept,
 			"Content-Type" => $this->args["type"],
 		], $body);
-		$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];
-			$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];
 	}
 }
diff --git a/app/Github/API/Releases/PublishRelease.php b/app/Github/API/Releases/PublishRelease.php
index 39c5169..d480376 100644
--- a/app/Github/API/Releases/PublishRelease.php
+++ b/app/Github/API/Releases/PublishRelease.php
@@ -5,10 +5,11 @@ namespace app\Github\API\Releases;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class PublishRelease extends Call
 {
-	function enqueue(callable $callback) {
+	function request() {
 		$url = $this->url->mod(uri_template("./repos/{+repo}/releases{/id}", $this->args));
 		$request = new Request("PATCH", $url, [
 			"Authorization" => "token ". $this->api->getToken(),
@@ -19,13 +20,13 @@ class PublishRelease extends Call
 			"draft" => false,
 			"tag_name" => $this->args["tag"],
 		]));
-		$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];
-			$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];
 	}
 }
\ No newline at end of file
diff --git a/app/views/github/repo.phtml b/app/views/github/repo.phtml
index 9d5f7eb..fff952d 100644
--- a/app/views/github/repo.phtml
+++ b/app/views/github/repo.phtml
@@ -204,42 +204,43 @@
 		<?php if (!empty($v->release)) : ?>
 			<p><?= $this->md($v->release->body) ?></p>
 		<?php endif; ?>
-		<ul class="list-inline">
-			<li>
-				<span class="octicon octicon-tag" title="Tag"></span>
-				<span class="label label-default"><?= $this->e($v->tag->name) ?></span>
-			</li>
+				<ul class="list-inline">
+					<li>
+						<span class="octicon octicon-tag" title="Tag"></span>
+						<span class="label label-default"><?= $this->e($v->tag->name) ?></span>
+					</li>
 
-			<?php if (!empty($v->release)) : ?>
-			<li>
-				<span class="octicon octicon-git-branch" title="Branch"></span>
-				<span class="label label-default"><?= $this->e($v->release->target_commitish) ?></span>
-			</li>
-			<li>
-				<span class="octicon octicon-clock" title="Date"></span>
-				<span class="label label-default">
-					<time datetime="<?= $v->release->published_at ?>">
-						<?= $this->utc($v->release->published_at)->format("Y-m-d H:i T") ?>
-					</time>
-				</span>
-			<?php endif; ?>
-		</ul>
+					<?php if (!empty($v->release)) : ?>
+					<li>
+						<span class="octicon octicon-git-branch" title="Branch"></span>
+						<span class="label label-default"><?= $this->e($v->release->target_commitish) ?></span>
+					</li>
+					<li>
+						<span class="octicon octicon-clock" title="Date"></span>
+						<span class="label label-default">
+							<time datetime="<?= $v->release->published_at ?>">
+								<?= $this->utc($v->release->published_at)->format("Y-m-d H:i T") ?>
+							</time>
+						</span>
+					<?php endif; ?>
+				</ul>
 			</div>
 			<div class="col-sm-4">
-			<ul class="list-inline pull-right">
 			<?php if (!empty($v->release->assets)) : ?>
-				<?php foreach ($v->release->assets as $asset) : ?>
-				<?php if (fnmatch("*.ext.phar", $asset->name)) : ?>
-				<li>
-					<a class="btn btn-success" href="<?= $this->e($asset->browser_download_url) ?>">
-						<span class="octicon octicon-package"></span>
-						<?= $this->e($asset->name) ?>
-					</a>
-				</li>
-				<?php endif; ?>
-				<?php endforeach; ?>
+				<ul class="list-inline pull-right">
+					<?php foreach ($v->release->assets as $asset) : ?>
+					<?php if (fnmatch("*.ext.phar", $asset->name)) : ?>
+					<li>
+						<a class="btn btn-success" href="<?= $this->e($asset->browser_download_url) ?>">
+							<span class="octicon octicon-package"></span>
+							<?= $this->e($asset->name) ?>
+						</a>
+					</li>
+					<?php endif; ?>
+					<?php endforeach; ?>
+				</ul>
 			<?php else: ?>
-				<form class="form-inline" method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/release") ?>">
+				<form class="form-inline pull-right" method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/release") ?>">
 					<input type="hidden" name="tag" value="<?= $this->e($v->tag->name) ?>">
 					<div class="checkbox">
 						<label for="hook-zend">
@@ -259,7 +260,7 @@
 					</button>
 				</form>
 			<?php endif; ?>
-			</ul>
+			
 			</div>
 		</div>
 	</div>