projects
/
pharext
/
pharext.org
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix response if no action is to be taken
[pharext/pharext.org]
/
app
/
Controller
/
Github
/
Hook
/
Receive.php
diff --git
a/app/Controller/Github/Hook/Receive.php
b/app/Controller/Github/Hook/Receive.php
index 3dc519a36290716b9ad0993a68f90775bd7d3dc6..1094fd25e45491c894d07ae3f15389a228fb3079 100644
(file)
--- a/
app/Controller/Github/Hook/Receive.php
+++ b/
app/Controller/Github/Hook/Receive.php
@@
-51,7
+51,14
@@
class Receive implements Controller
case "create":
case "release":
if (($json = json_decode($request->getBody()))) {
case "create":
case "release":
if (($json = json_decode($request->getBody()))) {
- $this->$evt($json);
+ if (($queue = $this->$evt($json))) {
+ $queue->done(function($result) use($response) {
+ list($created) = $result;
+ $response->setResponseCode(201);
+ $response->setHeader("Location", $created->url);
+ });
+ $this->github->drain();
+ }
} else {
$response->setResponseCode(415);
$response->setContentType($request->getHeader("Content-Type"));
} else {
$response->setResponseCode(415);
$response->setContentType($request->getHeader("Content-Type"));
@@
-94,15
+101,10
@@
class Receive implements Controller
}
$this->setTokenForUser($release->repository->owner->login);
}
$this->setTokenForUser($release->repository->owner->login);
- $this->github->uploadAssetForRelease(
+
return
$this->github->uploadAssetForRelease(
$release->release,
$release->repository
$release->release,
$release->repository
- )->done(function($result) use($response) {
- list($created) = $result;
- $response->setResponseCode(201);
- $response->setHeader("Location", $created->url);
- });
- $this->github->drain();
+ );
}
private function create($create) {
}
private function create($create) {
@@
-115,14
+117,9
@@
class Receive implements Controller
}
$this->setTokenForUser($create->repository->owner->login);
}
$this->setTokenForUser($create->repository->owner->login);
- $this->github->createReleaseFromTag(
+
return
$this->github->createReleaseFromTag(
$create->repository,
$create->ref
$create->repository,
$create->ref
- )->done(function($result) use($response) {
- list($created) = $result;
- $response->setResponseCode(201);
- $response->setHeader("Location", $created->url);
- });
- $this->github->drain();
+ );
}
}
}
}