deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added new build source: Webhook (Pull request).

Browse source
This commit is contained in:
Dmitry Khomutov 2017-12-27 23:05:04 +07:00
commit eecf3ea3ce
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
6 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/PHPCensor/Model/Build.php
View file

@ -27,11 +27,12 @@ class Build extends Model
const STATUS_SUCCESS = 2;
const STATUS_FAILED = 3;
const SOURCE_UNKNOWN = 0;
const SOURCE_MANUAL_WEB = 1;
const SOURCE_MANUAL_CONSOLE = 2;
const SOURCE_PERIODICAL = 3;
const SOURCE_WEBHOOK = 4;
const SOURCE_UNKNOWN = 0;
const SOURCE_MANUAL_WEB = 1;
const SOURCE_MANUAL_CONSOLE = 2;
const SOURCE_PERIODICAL = 3;
const SOURCE_WEBHOOK = 4;
const SOURCE_WEBHOOK_PULL_REQUEST = 5;
/**
* @var array
@ -1037,6 +1038,8 @@ OUT;
switch ($this->getSource()) {
case Build::SOURCE_WEBHOOK:
return 'source_webhook';
case Build::SOURCE_WEBHOOK_PULL_REQUEST:
return 'source_webhook_pull_request';
case Build::SOURCE_MANUAL_WEB:
return 'source_manual_web';
case Build::SOURCE_MANUAL_CONSOLE:

4
src/PHPCensor/Model/Build/BitbucketBuild.php
View file

@ -12,7 +12,7 @@ use PHPCensor\Model\BuildError;
/**
* BitBucket Build Model
*
*
* @author Dan Cryer <dan@block8.co.uk>
*/
class BitbucketBuild extends RemoteGitBuild
@ -48,7 +48,7 @@ class BitbucketBuild extends RemoteGitBuild
*/
public function sendStatusPostback()
{
if (Build::SOURCE_WEBHOOK !== $this->getSource()) {
if (!in_array($this->getSource(), [Build::SOURCE_WEBHOOK, Build::SOURCE_WEBHOOK_PULL_REQUEST], true)) {
return false;
}

8
src/PHPCensor/Model/Build/GithubBuild.php
View file

@ -12,7 +12,7 @@ use PHPCensor\Model\BuildError;
/**
* Github Build Model
*
*
* @author Dan Cryer <dan@block8.co.uk>
*/
class GithubBuild extends RemoteGitBuild
@ -46,7 +46,7 @@ class GithubBuild extends RemoteGitBuild
*/
public function sendStatusPostback()
{
if (Build::SOURCE_WEBHOOK !== $this->getSource()) {
if (!in_array($this->getSource(), [Build::SOURCE_WEBHOOK, Build::SOURCE_WEBHOOK_PULL_REQUEST], true)) {
return false;
}
@ -54,7 +54,7 @@ class GithubBuild extends RemoteGitBuild
if (empty($project)) {
return false;
}
$token = Config::getInstance()->get('php-censor.github.token');
if (empty($token) || empty($this->data['id'])) {
@ -97,7 +97,7 @@ class GithubBuild extends RemoteGitBuild
'context' => 'PHP Censor',
]
]);
return true;
}