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

Merge pull request #223 from deep9/issue_221_gitlab

Browse source 
Proposed enhancement - fix for #221 GitlabBuild
This commit is contained in:
Mark Clements 2013-11-27 03:38:39 -08:00
parent b461650cd8 02dff2b081
commit 12cca9c93c
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PHPCI/Model/Base/ProjectBase.php
View file

@ -215,11 +215,19 @@ class ProjectBase extends Model
/**
* Get the value of AccessInformation / access_information.
*
* @param string|null $key Key of desired information
*
* @return string
*/
public function getAccessInformation()
public function getAccessInformation($key = null)
{
$rtn = $this->data['access_information'];
if (is_null($key)) {
$rtn = $this->data['access_information'];
} else if (isset($this->data['access_information'][$key])) {
$rtn = $this->data['access_information'][$key];
} else {
$rtn = null;
}
return $rtn;
}

8
PHPCI/Model/Build/GitlabBuild.php
View file

@ -25,7 +25,7 @@ class GitlabBuild extends RemoteGitBuild
*/
public function getCommitLink()
{
$domain = $this->getProject()->getAccessInformation()["domain"];
$domain = $this->getProject()->getAccessInformation("domain");
return 'http://' . $domain . '/' . $this->getProject()->getReference() . '/commit/' . $this->getCommitId();
}
@ -34,7 +34,7 @@ class GitlabBuild extends RemoteGitBuild
*/
public function getBranchLink()
{
$domain = $this->getProject()->getAccessInformation()["domain"];
$domain = $this->getProject()->getAccessInformation("domain");
return 'http://' . $domain . '/' . $this->getProject()->getReference() . '/tree/' . $this->getBranch();
}
@ -46,8 +46,8 @@ class GitlabBuild extends RemoteGitBuild
$key = trim($this->getProject()->getGitKey());
if (!empty($key)) {
$user = $this->getProject()->getAccessInformation()["user"];
$domain = $this->getProject()->getAccessInformation()["domain"];
$user = $this->getProject()->getAccessInformation("user");
$domain = $this->getProject()->getAccessInformation("domain");
return $user . '@' . $domain . ':' . $this->getProject()->getReference() . '.git';
}
}