deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove whitespace from empty lines, reformatted inline comments

Browse source
This commit is contained in:
Mike Bronner 2015-10-23 13:55:04 -07:00 committed by wodka
parent 66ffea12f0
commit fe9289eda5
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
PHPCI/Controller/WebhookController.php
View file

@ -85,30 +85,25 @@ class WebhookController extends \b8\Controller
public function bitbucket($projectId) public function bitbucket($projectId)
{ {
$project = $this->fetchProject($projectId, 'bitbucket'); $project = $this->fetchProject($projectId, 'bitbucket');
/* // Support both old services and new webhooks
* support both old services and new webhooks
*/
if ($payload = $this->getParam('payload')) { if ($payload = $this->getParam('payload')) {
return $this->bitbucketService(json_decode($payload, true), $project); return $this->bitbucketService(json_decode($payload, true), $project);
} }
$payload = json_decode(file_get_contents("php://input"), true); $payload = json_decode(file_get_contents("php://input"), true);
if (empty($payload['push']['changes'])) { if (empty($payload['push']['changes'])) {
/* // Invalid event from bitbucket
* invalid event from bitbucket
*/
return [ return [
'status' => 'failed', 'status' => 'failed',
'commits' => [] 'commits' => []
]; ];
} }
return $this->bitbucketWebhook($payload, $project); return $this->bitbucketWebhook($payload, $project);
} }
/** /**
* Bitbucket webhooks. * Bitbucket webhooks.
*/ */
@ -137,7 +132,7 @@ class WebhookController extends \b8\Controller
return array('status' => $status, 'commits' => $results); return array('status' => $status, 'commits' => $results);
} }
/** /**
* Bitbucket POST service. * Bitbucket POST service.
*/ */