X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2FGithub%2FAPI.php;h=0ae7655e1f99e9606c5659950636281bb9ddeb01;hb=21ea66aa639b5c7bbd63d687d4445f821d1475ec;hp=c7a2b05075f18387fcc7878688aada799475642b;hpb=ee3977104c9ea0984c76f75f965c528bc4b3b64e;p=pharext%2Fpharext.org diff --git a/app/Github/API.php b/app/Github/API.php index c7a2b05..0ae7655 100644 --- a/app/Github/API.php +++ b/app/Github/API.php @@ -243,11 +243,15 @@ class API return $this->queue(new API\Releases\ListReleaseAssets($this, compact("repo", "id"))); } - function uploadAssetForRelease($repo, $release, $config) { + function uploadAssetForRelease($repo, $release, $config = null) { return $this->listHooks($repo->full_name)->then(function($result) use($release, $repo, $config) { list($repo->hooks) = $result; - $hook = $this->checkRepoHook($repo); - $phar = new Pharext\Package($repo->clone_url, $release->tag_name, $repo->name, $config ?: $hook->config); + $phar = new Pharext\Package( + $repo->clone_url, + $release->tag_name, + $repo->name, + $config ?: (array) $this->checkRepoHook($repo)->config + ); $name = sprintf("%s-%s.ext.phar", $repo->name, $release->tag_name); $url = uri_template($release->upload_url, compact("name")); $promise = $this->createReleaseAsset($url, $phar, "application/phar"); @@ -260,7 +264,7 @@ class API }); } - function createReleaseFromTag($repo, $tag_name, $config) { + function createReleaseFromTag($repo, $tag_name, $config = null) { return $this->createRelease($repo->full_name, $tag_name)->then(function($result) use($repo, $config) { list($release) = $result; return $this->uploadAssetForRelease($repo, $release, $config);