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

Refactored push and tag webhooks for Github (Fixes +++).

Browse source
This commit is contained in:
Dmitry Khomutov 2017-04-20 21:14:48 +07:00
parent 0e83599b9f
commit f26f000bb4
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/PHPCensor/Controller/WebhookController.php
View file

@ -246,7 +246,7 @@ class WebhookController extends Controller
} else {
try {
if ($isTag) {
$branch = str_replace('refs/tags/', 'Tag: ', $payload['ref']);
$branch = str_replace('refs/heads/', '', $payload['base_ref']);
$committer = $payload['pusher']['email'];
} else {
$branch = str_replace('refs/heads/', '', $payload['ref']);
@ -513,7 +513,7 @@ class WebhookController extends Controller
}
// Check if a build already exists for this commit ID:
$builds = $this->buildStore->getByProjectAndCommit($project->getId(), $commitId, $branch);
$builds = $this->buildStore->getByProjectAndCommit($project->getId(), $commitId);
$ignore_environments = [];
if ($builds['count']) {

6
src/PHPCensor/Store/BuildStore.php
View file

@ -180,18 +180,16 @@ class BuildStore extends Store
*
* @param integer $projectId
* @param string $commitId
* @param string $branch
*
* @return array
*/
public function getByProjectAndCommit($projectId, $commitId, $branch)
public function getByProjectAndCommit($projectId, $commitId)
{
$query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :project_id AND {{commit_id}} = :commit_id AND {{branch}} = :branch';
$query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :project_id AND {{commit_id}} = :commit_id';
$stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':project_id', $projectId);
$stmt->bindValue(':commit_id', $commitId);
$stmt->bindValue(':branch', $branch);
if ($stmt->execute()) {
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);