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

Added BuildStatus::ccxml tests.

Browse source
This commit is contained in:
Marco Vito Moscaritolo 2015-05-31 16:32:50 +02:00
commit e977360083
2 changed files with 82 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PHPCI/Controller/BuildStatusController.php
View file

@ -11,11 +11,13 @@ namespace PHPCI\Controller;
use b8;
use b8\Exception\HttpException\NotFoundException;
use b8\Exception\HttpException\NotAuthorizedException;
use b8\Store;
use b8\Http\Request;
use b8\Http\Response;
use PHPCI\Config;
use PHPCI\BuildFactory;
use PHPCI\Helper\Lang;
use PHPCI\Model\Project;
use PHPCI\Model\Build;
use PHPCI\Service\BuildStatusService;
@ -50,8 +52,6 @@ class BuildStatusController extends \PHPCI\Controller
{
parent::__construct($config, $request, $response);
$this->response->disableLayout();
$this->buildStore = $buildStore;
$this->projectStore = $projectStore;
}
@ -98,12 +98,16 @@ class BuildStatusController extends \PHPCI\Controller
{
/* @var Project $project */
$project = $this->projectStore->getById($projectId);
$xml = new \SimpleXMLElement('<Projects/>');
if (!$project instanceof Project || !$project->getAllowPublicStatus()) {
return $this->renderXml($xml);
if (!$project instanceof Project) {
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
}
if (!$project->getAllowPublicStatus()) {
throw new NotAuthorizedException();
}
$xml = new \SimpleXMLElement('<Projects/>');
try {
$branchList = $this->buildStore->getBuildBranches($projectId);
@ -120,7 +124,6 @@ class BuildStatusController extends \PHPCI\Controller
}
}
}
} catch (\Exception $e) {
$xml = new \SimpleXMLElement('<projects/>');
}
@ -134,12 +137,11 @@ class BuildStatusController extends \PHPCI\Controller
*/
protected function renderXml(\SimpleXMLElement $xml = null)
{
$this->response->disableLayout();
$this->response->setHeader('Content-Type', 'text/xml');
$this->response->setContent($xml->asXML());
$this->response->flush();
echo $xml->asXML();
return true;
return $this->response;
}
/**
@ -170,6 +172,7 @@ class BuildStatusController extends \PHPCI\Controller
$this->response->disableLayout();
$this->response->setHeader('Content-Type', 'image/svg+xml');
$this->response->setContent($image);
return $this->response;
}