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 30a744e4ff3d5f69b844b9aca0ae8fe9f1c7fc02..1094fd25e45491c894d07ae3f15389a228fb3079 100644 (file)
--- a/app/Controller/Github/Hook/Receive.php
+++ b/app/Controller/Github/Hook/Receive.php
@@ -7,9 +7,6 @@ use app\Github\API;
 use app\Model\Accounts;
 use app\Web;
 use http\Params;
-use pharext\Task;
-use pharext\Metadata;
-use pharext\SourceDir;
 
 class Receive implements Controller
 {
@@ -54,7 +51,14 @@ class Receive implements Controller
                        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"));
@@ -97,10 +101,10 @@ class Receive implements Controller
                }
                
                $this->setTokenForUser($release->repository->owner->login);
-               $this->github->uploadAssetForRelease($release->release, $release->repository, null, function($json) use($response) {
-                       $response->setResponseCode(201);
-                       $response->setHeader("Location", $json->url);
-               })->send();
+               return $this->github->uploadAssetForRelease(
+                       $release->release,
+                       $release->repository
+               );
        }
        
        private function create($create) {
@@ -113,32 +117,9 @@ class Receive implements Controller
                }
                
                $this->setTokenForUser($create->repository->owner->login);
-               $this->github->createReleaseFromTag($create->repository, $create->ref, null, function($json) use($response) {
-                       $response->setResponseCode(201);
-                       $response->setHeader("Location", $json->url);
-               })->send();
+               return $this->github->createReleaseFromTag(
+                       $create->repository, 
+                       $create->ref
+               );
        }
-       
-       private function createReleaseAsset($release, $repo) {
-               $hook = $this->github->checkRepoHook($repo);
-               $phar = new Pharext\Package($repo->clone_url, $release->tag_name, $repo->name, $hook->config);
-               return $phar->getFile();
-
-               $dir = (new Task\GitClone($repo->clone_url, $release->tag_name))->run();
-               if (!empty($hook->config->pecl)) {
-                       $src = new SoureDir\Pecl($dir);
-               } else {
-                       $src = new SourceDir\Git($dir);
-               }
-               $meta = Metadata::all() + [
-                       "name" => $repo->name,
-                       "release" => $release->tag_name,
-                       "license" => $src->getLicense(),
-                       "stub" => "pharext_installer.php",
-                       "type" => !empty($hook->config->zend) ? "zend_extension" : "extension",
-               ];
-               $file = (new Task\PharBuild($src, $meta))->run();
-               return $file;
-       }
-
 }