PSR2 compliance for PHPCI/Controller - Issue #18
This commit is contained in:
Dan Cryer
parent
65f93555be
commit
e4a6e224c4
7 changed files with 658 additions and 680 deletions
|
|
@ -8,11 +8,12 @@
|
|||
*/
|
||||
|
||||
namespace PHPCI\Controller;
|
||||
use b8,
|
||||
PHPCI\Model\Build,
|
||||
PHPCI\Model\Project,
|
||||
b8\Form,
|
||||
b8\Registry;
|
||||
|
||||
use b8;
|
||||
use PHPCI\Model\Build;
|
||||
use PHPCI\Model\Project;
|
||||
use b8\Form;
|
||||
use b8\Registry;
|
||||
|
||||
/**
|
||||
* Project Controller - Allows users to create, edit and view projects.
|
||||
|
|
@ -22,283 +23,280 @@ use b8,
|
|||
*/
|
||||
class ProjectController extends b8\Controller
|
||||
{
|
||||
public function init()
|
||||
{
|
||||
$this->_buildStore = b8\Store\Factory::getStore('Build');
|
||||
$this->_projectStore = b8\Store\Factory::getStore('Project');
|
||||
}
|
||||
public function init()
|
||||
{
|
||||
$this->_buildStore = b8\Store\Factory::getStore('Build');
|
||||
$this->_projectStore = b8\Store\Factory::getStore('Project');
|
||||
}
|
||||
|
||||
public function view($projectId)
|
||||
{
|
||||
$project = $this->_projectStore->getById($projectId);
|
||||
$page = $this->getParam('p', 1);
|
||||
$builds = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10));
|
||||
public function view($projectId)
|
||||
{
|
||||
$project = $this->_projectStore->getById($projectId);
|
||||
$page = $this->getParam('p', 1);
|
||||
$builds = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10));
|
||||
|
||||
$view = new b8\View('Project');
|
||||
$view->builds = $builds[0];
|
||||
$view->total = $builds[1];
|
||||
$view->project = $project;
|
||||
$view->page = $page;
|
||||
$view = new b8\View('Project');
|
||||
$view->builds = $builds[0];
|
||||
$view->total = $builds[1];
|
||||
$view->project = $project;
|
||||
$view->page = $page;
|
||||
|
||||
return $view->render();
|
||||
}
|
||||
return $view->render();
|
||||
}
|
||||
|
||||
public function build($projectId)
|
||||
{
|
||||
$build = new Build();
|
||||
$build->setProjectId($projectId);
|
||||
$build->setCommitId('Manual');
|
||||
$build->setStatus(0);
|
||||
$build->setBranch('master');
|
||||
$build->setCreated(new \DateTime());
|
||||
public function build($projectId)
|
||||
{
|
||||
$build = new Build();
|
||||
$build->setProjectId($projectId);
|
||||
$build->setCommitId('Manual');
|
||||
$build->setStatus(0);
|
||||
$build->setBranch('master');
|
||||
$build->setCreated(new \DateTime());
|
||||
|
||||
$build = $this->_buildStore->save($build);
|
||||
$build = $this->_buildStore->save($build);
|
||||
|
||||
header('Location: /build/view/' . $build->getId());
|
||||
}
|
||||
header('Location: /build/view/' . $build->getId());
|
||||
}
|
||||
|
||||
public function delete($id)
|
||||
{
|
||||
if(!Registry::getInstance()->get('user')->getIsAdmin())
|
||||
{
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
public function delete($id)
|
||||
{
|
||||
if (!Registry::getInstance()->get('user')->getIsAdmin()) {
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
|
||||
$project = $this->_projectStore->getById($id);
|
||||
$this->_projectStore->delete($project);
|
||||
$project = $this->_projectStore->getById($id);
|
||||
$this->_projectStore->delete($project);
|
||||
|
||||
header('Location: /');
|
||||
}
|
||||
header('Location: /');
|
||||
}
|
||||
|
||||
public function builds($projectId)
|
||||
{
|
||||
$builds = $this->getLatestBuildsHtml($projectId);
|
||||
die($builds[0]);
|
||||
}
|
||||
public function builds($projectId)
|
||||
{
|
||||
$builds = $this->getLatestBuildsHtml($projectId);
|
||||
die($builds[0]);
|
||||
}
|
||||
|
||||
protected function getLatestBuildsHtml($projectId, $start = 0)
|
||||
{
|
||||
$builds = $this->_buildStore->getWhere(array('project_id' => $projectId), 10, $start, array(), array('id' => 'DESC'));
|
||||
$view = new b8\View('BuildsTable');
|
||||
$view->builds = $builds['items'];
|
||||
protected function getLatestBuildsHtml($projectId, $start = 0)
|
||||
{
|
||||
$criteria = array('project_id' => $projectId), 10, $start, array(), array('id' => 'DESC');
|
||||
$builds = $this->_buildStore->getWhere($criteria);
|
||||
$view = new b8\View('BuildsTable');
|
||||
$view->builds = $builds['items'];
|
||||
|
||||
return array($view->render(), $builds['count']);
|
||||
}
|
||||
return array($view->render(), $builds['count']);
|
||||
}
|
||||
|
||||
public function add()
|
||||
{
|
||||
if(!Registry::getInstance()->get('user')->getIsAdmin())
|
||||
{
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
public function add()
|
||||
{
|
||||
if (!Registry::getInstance()->get('user')->getIsAdmin()) {
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
|
||||
$method = Registry::getInstance()->get('requestMethod');
|
||||
$method = Registry::getInstance()->get('requestMethod');
|
||||
|
||||
if($method == 'POST')
|
||||
{
|
||||
$values = $this->getParams();
|
||||
$pub = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
$tempPath = sys_get_temp_dir() . '/';
|
||||
if ($method == 'POST') {
|
||||
$values = $this->getParams();
|
||||
$pub = null;
|
||||
} else {
|
||||
$tempPath = sys_get_temp_dir() . '/';
|
||||
|
||||
// FastCGI fix for Windows machines, where temp path is not available to
|
||||
// PHP, and defaults to the unwritable system directory. If the temp
|
||||
// path is pointing to the system directory, shift to the 'TEMP'
|
||||
// sub-folder, which should also exist, but actually be writable.
|
||||
if ($tempPath == getenv("SystemRoot") . '/') {
|
||||
$tempPath = getenv("SystemRoot") . '/TEMP/';
|
||||
}
|
||||
// FastCGI fix for Windows machines, where temp path is not available to
|
||||
// PHP, and defaults to the unwritable system directory. If the temp
|
||||
// path is pointing to the system directory, shift to the 'TEMP'
|
||||
// sub-folder, which should also exist, but actually be writable.
|
||||
if ($tempPath == getenv("SystemRoot") . '/') {
|
||||
$tempPath = getenv("SystemRoot") . '/TEMP/';
|
||||
}
|
||||
|
||||
$id = $tempPath . md5(microtime(true));
|
||||
if (!is_dir($tempPath)) {
|
||||
mkdir($tempPath);
|
||||
}
|
||||
shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$id.' -N "" -C "deploy@phpci"');
|
||||
$id = $tempPath . md5(microtime(true));
|
||||
|
||||
$pub = file_get_contents($id . '.pub');
|
||||
$prv = file_get_contents($id);
|
||||
if (!is_dir($tempPath)) {
|
||||
mkdir($tempPath);
|
||||
}
|
||||
|
||||
$values = array('key' => $prv, 'pubkey' => $pub, 'token' => $_SESSION['github_token']);
|
||||
}
|
||||
shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$id.' -N "" -C "deploy@phpci"');
|
||||
|
||||
$form = $this->projectForm($values);
|
||||
$pub = file_get_contents($id . '.pub');
|
||||
$prv = file_get_contents($id);
|
||||
|
||||
if($method != 'POST' || ($method == 'POST' && !$form->validate()))
|
||||
{
|
||||
$gh = \b8\Registry::getInstance()->get('github_app');
|
||||
$code = $this->getParam('code', null);
|
||||
$values = array('key' => $prv, 'pubkey' => $pub, 'token' => $_SESSION['github_token']);
|
||||
}
|
||||
|
||||
if(!is_null($code))
|
||||
{
|
||||
$http = new \b8\HttpClient();
|
||||
$resp = $http->post('https://github.com/login/oauth/access_token', array('client_id' => $gh['id'], 'client_secret' => $gh['secret'], 'code' => $code));
|
||||
|
||||
if($resp['success'])
|
||||
{
|
||||
parse_str($resp['body'], $resp);
|
||||
$_SESSION['github_token'] = $resp['access_token'];
|
||||
header('Location: /project/add');
|
||||
die;
|
||||
}
|
||||
}
|
||||
$form = $this->projectForm($values);
|
||||
|
||||
$view = new b8\View('ProjectForm');
|
||||
$view->type = 'add';
|
||||
$view->project = null;
|
||||
$view->form = $form;
|
||||
$view->key = $pub;
|
||||
$view->token = $_SESSION['github_token'] ? $_SESSION['github_token'] : null;
|
||||
if ($method != 'POST' || ($method == 'POST' && !$form->validate())) {
|
||||
$gh = \b8\Registry::getInstance()->get('github_app');
|
||||
$code = $this->getParam('code', null);
|
||||
|
||||
return $view->render();
|
||||
}
|
||||
if (!is_null($code)) {
|
||||
$http = new \b8\HttpClient();
|
||||
$url = 'https://github.com/login/oauth/access_token';
|
||||
$params = array('client_id' => $gh['id'], 'client_secret' => $gh['secret'], 'code' => $code)
|
||||
$resp = $http->post($url, $params);
|
||||
|
||||
if ($resp['success']) {
|
||||
parse_str($resp['body'], $resp);
|
||||
$_SESSION['github_token'] = $resp['access_token'];
|
||||
header('Location: /project/add');
|
||||
die;
|
||||
}
|
||||
}
|
||||
|
||||
$values = $form->getValues();
|
||||
$values['git_key'] = $values['key'];
|
||||
$view = new b8\View('ProjectForm');
|
||||
$view->type = 'add';
|
||||
$view->project = null;
|
||||
$view->form = $form;
|
||||
$view->key = $pub;
|
||||
$view->token = $_SESSION['github_token'] ? $_SESSION['github_token'] : null;
|
||||
|
||||
$project = new Project();
|
||||
$project->setValues($values);
|
||||
return $view->render();
|
||||
}
|
||||
|
||||
$project = $this->_projectStore->save($project);
|
||||
$values = $form->getValues();
|
||||
$values['git_key'] = $values['key'];
|
||||
|
||||
header('Location: /project/view/' . $project->getId());
|
||||
die;
|
||||
}
|
||||
$project = new Project();
|
||||
$project->setValues($values);
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
if(!Registry::getInstance()->get('user')->getIsAdmin())
|
||||
{
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
|
||||
$method = Registry::getInstance()->get('requestMethod');
|
||||
$project = $this->_projectStore->getById($id);
|
||||
$project = $this->_projectStore->save($project);
|
||||
|
||||
if($method == 'POST')
|
||||
{
|
||||
$values = $this->getParams();
|
||||
}
|
||||
else
|
||||
{
|
||||
$values = $project->getDataArray();
|
||||
$values['key'] = $values['git_key'];
|
||||
}
|
||||
header('Location: /project/view/' . $project->getId());
|
||||
die;
|
||||
}
|
||||
|
||||
$form = $this->projectForm($values, 'edit/' . $id);
|
||||
public function edit($id)
|
||||
{
|
||||
if (!Registry::getInstance()->get('user')->getIsAdmin()) {
|
||||
throw new \Exception('You do not have permission to do that.');
|
||||
}
|
||||
|
||||
$method = Registry::getInstance()->get('requestMethod');
|
||||
$project = $this->_projectStore->getById($id);
|
||||
|
||||
if($method != 'POST' || ($method == 'POST' && !$form->validate()))
|
||||
{
|
||||
$view = new b8\View('ProjectForm');
|
||||
$view->type = 'edit';
|
||||
$view->project = $project;
|
||||
$view->form = $form;
|
||||
$view->key = null;
|
||||
if ($method == 'POST') {
|
||||
$values = $this->getParams();
|
||||
} else {
|
||||
$values = $project->getDataArray();
|
||||
$values['key'] = $values['git_key'];
|
||||
}
|
||||
|
||||
return $view->render();
|
||||
}
|
||||
$form = $this->projectForm($values, 'edit/' . $id);
|
||||
|
||||
$values = $form->getValues();
|
||||
$values['git_key'] = $values['key'];
|
||||
if ($method != 'POST' || ($method == 'POST' && !$form->validate())) {
|
||||
$view = new b8\View('ProjectForm');
|
||||
$view->type = 'edit';
|
||||
$view->project = $project;
|
||||
$view->form = $form;
|
||||
$view->key = null;
|
||||
|
||||
$project->setValues($values);
|
||||
$project = $this->_projectStore->save($project);
|
||||
return $view->render();
|
||||
}
|
||||
|
||||
header('Location: /project/view/' . $project->getId());
|
||||
die;
|
||||
}
|
||||
$values = $form->getValues();
|
||||
$values['git_key'] = $values['key'];
|
||||
|
||||
protected function projectForm($values, $type = 'add')
|
||||
{
|
||||
$form = new Form();
|
||||
$form->setMethod('POST');
|
||||
$form->setAction('/project/' . $type);
|
||||
$form->addField(new Form\Element\Csrf('csrf'));
|
||||
$form->addField(new Form\Element\Hidden('token'));
|
||||
$form->addField(new Form\Element\Hidden('pubkey'));
|
||||
$project->setValues($values);
|
||||
$project = $this->_projectStore->save($project);
|
||||
|
||||
$field = new Form\Element\Select('type');
|
||||
$field->setRequired(true);
|
||||
$field->setPattern('^(github|bitbucket|local)');
|
||||
$field->setOptions(array('choose' => 'Select repository type...', 'github' => 'Github', 'bitbucket' => 'Bitbucket', 'local' => 'Local Path'));
|
||||
$field->setLabel('Where is your project hosted?');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
header('Location: /project/view/' . $project->getId());
|
||||
die;
|
||||
}
|
||||
|
||||
if(isset($_SESSION['github_token']))
|
||||
{
|
||||
$field = new Form\Element\Select('github');
|
||||
$field->setLabel('Choose a Github repository:');
|
||||
$field->setClass('span4');
|
||||
$field->setOptions($this->getGithubRepositories());
|
||||
$form->addField($field);
|
||||
}
|
||||
protected function projectForm($values, $type = 'add')
|
||||
{
|
||||
$form = new Form();
|
||||
$form->setMethod('POST');
|
||||
$form->setAction('/project/' . $type);
|
||||
$form->addField(new Form\Element\Csrf('csrf'));
|
||||
$form->addField(new Form\Element\Hidden('token'));
|
||||
$form->addField(new Form\Element\Hidden('pubkey'));
|
||||
|
||||
$field = new Form\Element\Text('reference');
|
||||
$field->setRequired(true);
|
||||
$field->setValidator(function($val) use ($values)
|
||||
{
|
||||
$type = $values['type'];
|
||||
$options = array(
|
||||
'choose' => 'Select repository type...',
|
||||
'github' => 'Github',
|
||||
'bitbucket' => 'Bitbucket',
|
||||
'local' => 'Local Path'
|
||||
);
|
||||
|
||||
switch($type) {
|
||||
case 'local':
|
||||
if(!is_dir($val)) {
|
||||
throw new \Exception('The path you specified does not exist.');
|
||||
}
|
||||
break;
|
||||
$field = new Form\Element\Select('type');
|
||||
$field->setRequired(true);
|
||||
$field->setPattern('^(github|bitbucket|local)');
|
||||
$field->setOptions($options);
|
||||
$field->setLabel('Where is your project hosted?');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
|
||||
case 'github':
|
||||
case 'bitbucket':
|
||||
if(!preg_match('/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+$/', $val)) {
|
||||
throw new \Exception('Repository name must be in the format "owner/repo".');
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (isset($_SESSION['github_token'])) {
|
||||
$field = new Form\Element\Select('github');
|
||||
$field->setLabel('Choose a Github repository:');
|
||||
$field->setClass('span4');
|
||||
$field->setOptions($this->getGithubRepositories());
|
||||
$form->addField($field);
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
$field->setLabel('Repository Name / URL (Remote) or Path (Local)');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
$referenceValidator = function ($val) use ($values) {
|
||||
$type = $values['type'];
|
||||
|
||||
$field = new Form\Element\Text('title');
|
||||
$field->setRequired(true);
|
||||
$field->setLabel('Project Title');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
|
||||
$field = new Form\Element\TextArea('key');
|
||||
$field->setRequired(false);
|
||||
$field->setLabel('Private key to use to access repository (leave blank for local and/or anonymous remotes)');
|
||||
$field->setClass('span7');
|
||||
$field->setRows(6);
|
||||
$form->addField($field);
|
||||
switch($type) {
|
||||
case 'local':
|
||||
if (!is_dir($val)) {
|
||||
throw new \Exception('The path you specified does not exist.');
|
||||
}
|
||||
break;
|
||||
case 'github':
|
||||
case 'bitbucket':
|
||||
if (!preg_match('/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+$/', $val)) {
|
||||
throw new \Exception('Repository name must be in the format "owner/repo".');
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
$field = new Form\Element\Submit();
|
||||
$field->setValue('Save Project');
|
||||
$field->setClass('btn-success');
|
||||
$form->addField($field);
|
||||
return true;
|
||||
};
|
||||
|
||||
$form->setValues($values);
|
||||
return $form;
|
||||
}
|
||||
$field = new Form\Element\Text('reference');
|
||||
$field->setRequired(true);
|
||||
$field->setValidator($referenceValidator);
|
||||
$field->setLabel('Repository Name / URL (Remote) or Path (Local)');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
|
||||
protected function getGithubRepositories()
|
||||
{
|
||||
$http = new \b8\HttpClient();
|
||||
$res = $http->get('https://api.github.com/user/repos', array('type' => 'all', 'access_token' => $_SESSION['github_token']));
|
||||
$field = new Form\Element\Text('title');
|
||||
$field->setRequired(true);
|
||||
$field->setLabel('Project Title');
|
||||
$field->setClass('span4');
|
||||
$form->addField($field);
|
||||
|
||||
$field = new Form\Element\TextArea('key');
|
||||
$field->setRequired(false);
|
||||
$field->setLabel('Private key to use to access repository (leave blank for local and/or anonymous remotes)');
|
||||
$field->setClass('span7');
|
||||
$field->setRows(6);
|
||||
$form->addField($field);
|
||||
|
||||
$rtn = array();
|
||||
$rtn['choose'] = 'Select a repository...';
|
||||
if($res['success'])
|
||||
{
|
||||
foreach($res['body'] as $repo)
|
||||
{
|
||||
$rtn[$repo['full_name']] = $repo['full_name'];
|
||||
}
|
||||
}
|
||||
$field = new Form\Element\Submit();
|
||||
$field->setValue('Save Project');
|
||||
$field->setClass('btn-success');
|
||||
$form->addField($field);
|
||||
|
||||
return $rtn;
|
||||
}
|
||||
}
|
||||
$form->setValues($values);
|
||||
return $form;
|
||||
}
|
||||
|
||||
protected function getGithubRepositories()
|
||||
{
|
||||
$http = new \b8\HttpClient();
|
||||
$url = 'https://api.github.com/user/repos';
|
||||
$res = $http->get($url, array('type' => 'all', 'access_token' => $_SESSION['github_token']));
|
||||
|
||||
$rtn = array();
|
||||
$rtn['choose'] = 'Select a repository...';
|
||||
if ($res['success']) {
|
||||
foreach ($res['body'] as $repo) {
|
||||
$rtn[$repo['full_name']] = $repo['full_name'];
|
||||
}
|
||||
}
|
||||
|
||||
return $rtn;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue