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

Added 'user_id' column to 'build' table (created by)

Browse source 
+ Renamed columns 'created' -> 'create_date', 'started' -> 'start_date' and 'finished' -> 'finish_date'
+ Code style fixes.
This commit is contained in:
Dmitry Khomutov 2017-10-15 21:58:36 +07:00
commit 4ec6d854c2
29 changed files with 550 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/PHPCensor/Controller/BuildController.php
View file

@ -125,20 +125,20 @@ class BuildController extends Controller
*/
protected function getBuildData(Build $build)
{
$data = [];
$data['status'] = (int)$build->getStatus();
$data['log'] = $this->cleanLog($build->getLog());
$data['created'] = !is_null($build->getCreated()) ? $build->getCreated()->format('Y-m-d H:i:s') : null;
$data['started'] = !is_null($build->getStarted()) ? $build->getStarted()->format('Y-m-d H:i:s') : null;
$data['finished'] = !is_null($build->getFinished()) ? $build->getFinished()->format('Y-m-d H:i:s') : null;
$data['duration'] = $build->getDuration();
$data = [];
$data['status'] = (int)$build->getStatus();
$data['log'] = $this->cleanLog($build->getLog());
$data['create_date'] = !is_null($build->getCreateDate()) ? $build->getCreateDate()->format('Y-m-d H:i:s') : null;
$data['start_date'] = !is_null($build->getStartDate()) ? $build->getStartDate()->format('Y-m-d H:i:s') : null;
$data['finish_date'] = !is_null($build->getFinishDate()) ? $build->getFinishDate()->format('Y-m-d H:i:s') : null;
$data['duration'] = $build->getDuration();
/** @var \PHPCensor\Store\BuildErrorStore $errorStore */
$errorStore = b8\Store\Factory::getStore('BuildError');
$errors = $errorStore->getErrorsForBuild($build->getId());
$errorView = new b8\View('Build/errors');
$errorView->build = $build;
$errorView = new b8\View('Build/errors');
$errorView->build = $build;
$errorView->errors = $errors;
$data['errors'] = $errorStore->getErrorTotalForBuild($build->getId());

6
src/PHPCensor/Controller/ProjectController.php
View file

@ -173,16 +173,18 @@ class ProjectController extends PHPCensor\Controller
];
}
$email = $_SESSION['php-censor-user']->getEmail();
/** @var PHPCensor\Model\User $user */
$user = $_SESSION['php-censor-user'];
$build = $this->buildService->createBuild(
$project,
$environment,
'',
$branch,
null,
$email,
$user->getEmail(),
null,
Build::SOURCE_MANUAL_WEB,
$user->getId(),
$extra
);

2
src/PHPCensor/Controller/WebhookController.php
View file

@ -666,6 +666,7 @@ class WebhookController extends Controller
$committer,
$commitMessage,
Build::SOURCE_WEBHOOK,
0,
$extra
);
@ -704,6 +705,7 @@ class WebhookController extends Controller
$committer,
$commitMessage,
Build::SOURCE_WEBHOOK,
0,
$extra
);