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

Initial work on adding a Services layer to PHPCI, for better testability. Starting with Projects

Browse source
This commit is contained in:
Dan Cryer 2014-07-14 14:01:29 +01:00
commit af4cdd90b6
5 changed files with 244 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
PHPCI/Controller/ProjectController.php
View file

@ -20,6 +20,7 @@ use PHPCI\Helper\Github;
use PHPCI\Helper\SshKey;
use PHPCI\Model\Build;
use PHPCI\Model\Project;
use PHPCI\Service\ProjectService;
/**
* Project Controller - Allows users to create, edit and view projects.
@ -39,10 +40,16 @@ class ProjectController extends \PHPCI\Controller
*/
protected $projectStore;
/**
* @var \PHPCI\Service\ProjectService
*/
protected $projectService;
public function init()
{
$this->buildStore = Store\Factory::getStore('Build');
$this->projectStore = Store\Factory::getStore('Project');
$this->projectService = new ProjectService($this->projectStore);
}
/**
@ -179,35 +186,23 @@ class ProjectController extends \PHPCI\Controller
return $view->render();
} else {
return $this->addProject($form);
$title = $this->getParam('title', 'New Project');
$reference = $this->getParam('reference', null);
$type = $this->getParam('type', null);
$options = array(
'ssh_private_key' => $this->getParam('key', null),
'ssh_public_key' => $this->getParam('pubkey', null),
'build_config' => $this->getParam('build_config', null),
'allow_public_status' => $this->getParam('allow_public_status', 0),
);
$project = $this->projectService->createProject($title, $reference, $type, $options);
header('Location: '.PHPCI_URL.'project/view/' . $project->getId());
die;
}
}
protected function addProject(Form $form)
{
$values = $form->getValues();
$matches = array();
if ($values['type'] == "gitlab" && preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches)) {
$info = array();
$info['user'] = $matches[1];
$info['domain'] = $matches[2];
$values['access_information'] = serialize($info);
$values['reference'] = $matches[3]."/".$matches[4];
}
$values['ssh_private_key'] = $values['key'];
$values['ssh_public_key'] = $values['pubkey'];
$project = new Project();
$project->setValues($values);
$project = $this->projectStore->save($project);
header('Location: '.PHPCI_URL.'project/view/' . $project->getId());
die;
}
/**
* Edit a project. Handles both the form and processing.
*/