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

Fixing some issues with project default branches, adding tests for that too

Browse source
This commit is contained in:
Dan Cryer 2014-07-14 14:59:04 +01:00
commit cb53ec9c6d
6 changed files with 111 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ class ProjectBase extends Model
'id' => null,
'title' => null,
'reference' => null,
'branch' => null,
'ssh_private_key' => null,
'ssh_public_key' => null,
'type' => null,
@ -200,17 +201,15 @@ class ProjectBase extends Model
}
/**
* Get the value of Branch / branch.
*
* @return string
*/
* Get the value of Branch / branch.
*
* @return string
*/
public function getBranch()
{
if (empty($this->data['branch'])) {
return $this->getType() === 'hg' ? 'default' : 'master';
} else {
return $this->data['branch'];
}
$rtn = $this->data['branch'];
return $rtn;
}
/**
@ -365,6 +364,7 @@ class ProjectBase extends Model
*/
public function setBranch($value)
{
$this->_validateNotNull('Branch', $value);
$this->_validateString('Branch', $value);
if ($this->data['branch'] === $value) {