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

Added "Github Enterprise" build type. Issue #163.

Browse source
This commit is contained in:
Dmitry Khomutov 2018-03-19 22:32:30 +07:00
commit c61602189a
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
9 changed files with 90 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Controller/ProjectController.php
View file

@ -7,7 +7,6 @@ use PHPCensor\Form;
use JasonGrimes\Paginator;
use PHPCensor;
use PHPCensor\BuildFactory;
use PHPCensor\Helper\Github;
use PHPCensor\Helper\Lang;
use PHPCensor\Helper\SshKey;
use PHPCensor\Service\BuildService;
@ -375,7 +374,7 @@ class ProjectController extends WebController
$values['pubkey'] = $values['ssh_public_key'];
$values['environments'] = $project->getEnvironments();
if ($values['type'] == 'gitlab') {
if (Project::TYPE_GITLAB === $values['type']) {
$accessInfo = $project->getAccessInformation();
$reference = $accessInfo["user"] . '@' . $accessInfo["domain"] . ':' . $accessInfo["port"] . '/' . ltrim($project->getReference(), '/') . ".git";
$values['reference'] = $reference;
@ -453,14 +452,6 @@ class ProjectController extends WebController
$field->setClass('form-control')->setContainerClass('form-group');
$form->addField($field);
$container = new Form\ControlGroup('github-container');
$container->setClass('github-container');
$field = Form\Element\Select::create('github', Lang::get('choose_github'), false);
$field->setClass('form-control')->setContainerClass('form-group');
$container->addField($field);
$form->addField($container);
$field = Form\Element\Text::create('reference', Lang::get('repo_name'), true);
$field->setValidator($this->getReferenceValidator($values));
$field->setClass('form-control')->setContainerClass('form-group');
@ -547,27 +538,27 @@ class ProjectController extends WebController
$type = $values['type'];
$validators = [
'hg' => [
Project::TYPE_HG => [
'regex' => '/^(ssh|https?):\/\//',
'message' => Lang::get('error_hg')
],
'git' => [
Project::TYPE_GIT => [
'regex' => '/^(git|https?):\/\//',
'message' => Lang::get('error_git')
],
'gitlab' => [
'regex' => '`^(.*)@(.*):(.*)/(.*)\.git`',
Project::TYPE_GITLAB => [
'regex' => '/^(git|https?):\/\//',
'message' => Lang::get('error_gitlab')
],
'github' => [
'regex' => '/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-\.]+$/',
Project::TYPE_GITHUB => [
'regex' => '/^(git|https?):\/\//',
'message' => Lang::get('error_github')
],
'bitbucket' => [
Project::TYPE_BITBUCKET => [
'regex' => '/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-\.]+$/',
'message' => Lang::get('error_bitbucket')
],
'bitbucket-hg' => [
Project::TYPE_BITBUCKET_HG => [
'regex' => '/^[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-\.]+$/',
'message' => Lang::get('error_bitbucket')
],
@ -582,17 +573,4 @@ class ProjectController extends WebController
return true;
};
}
/**
* Get an array of repositories from Github's API.
*/
public function ajaxGithubRepositories()
{
$github = new Github();
$response = new PHPCensor\Http\Response\JsonResponse();
$response->setContent($github->getRepositories());
return $response;
}
}