Code style fixes.

This commit is contained in:
Dmitry Khomutov 2017-11-09 20:51:07 +07:00
commit cd6bfa5942
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
5 changed files with 69 additions and 52 deletions

View file

@ -722,7 +722,7 @@ class WebhookController extends Controller
/** /**
* Fetch a project and check its type. * Fetch a project and check its type.
* *
* @param int|string $projectId id or title * @param int|string $projectId id or title of project
* @param array|string $expectedType * @param array|string $expectedType
* *
* @return Project * @return Project
@ -736,7 +736,7 @@ class WebhookController extends Controller
} }
if (is_numeric($projectId)) { if (is_numeric($projectId)) {
$project = $this->projectStore->getById($projectId); $project = $this->projectStore->getById((integer)$projectId);
} else { } else {
$projects = $this->projectStore->getByTitle($projectId, 2); $projects = $this->projectStore->getByTitle($projectId, 2);
if ($projects['count'] < 1) { if ($projects['count'] < 1) {

View file

@ -2,11 +2,15 @@
namespace PHPCensor\Controller; namespace PHPCensor\Controller;
use b8;
use PHPCensor\BuildFactory;
use PHPCensor\Helper\Lang;
use PHPCensor\Model\Build; use PHPCensor\Model\Build;
use PHPCensor\Controller; use PHPCensor\Controller;
use b8\Store\Factory;
use b8\View;
use PHPCensor\Model\Project;
use b8\Http\Response;
use PHPCensor\Store\BuildStore;
use PHPCensor\Store\ProjectStore;
use PHPCensor\Store\ProjectGroupStore;
/** /**
* Widget All Projects Controller * Widget All Projects Controller
@ -14,17 +18,17 @@ use PHPCensor\Controller;
class WidgetAllProjectsController extends Controller class WidgetAllProjectsController extends Controller
{ {
/** /**
* @var \PHPCensor\Store\BuildStore * @var BuildStore
*/ */
protected $buildStore; protected $buildStore;
/** /**
* @var \PHPCensor\Store\ProjectStore * @var ProjectStore
*/ */
protected $projectStore; protected $projectStore;
/** /**
* @var \PHPCensor\Store\ProjectGroupStore * @var ProjectGroupStore
*/ */
protected $groupStore; protected $groupStore;
@ -33,13 +37,13 @@ class WidgetAllProjectsController extends Controller
*/ */
public function init() public function init()
{ {
$this->buildStore = b8\Store\Factory::getStore('Build'); $this->buildStore = Factory::getStore('Build');
$this->projectStore = b8\Store\Factory::getStore('Project'); $this->projectStore = Factory::getStore('Project');
$this->groupStore = b8\Store\Factory::getStore('ProjectGroup'); $this->groupStore = Factory::getStore('ProjectGroup');
} }
/** /**
* Display dashboard: * Display dashboard.
*/ */
public function index() public function index()
{ {
@ -53,15 +57,17 @@ class WidgetAllProjectsController extends Controller
/** /**
* Generate the HTML for the project overview section of the dashboard. * Generate the HTML for the project overview section of the dashboard.
* @param $projects *
* @param Project[] $projects
*
* @return string * @return string
*/ */
protected function getSummaryHtml($projects) protected function getSummaryHtml($projects)
{ {
$summaryBuilds = []; $summaryBuilds = [];
$successes = []; $successes = [];
$failures = []; $failures = [];
$counts = []; $counts = [];
foreach ($projects as $project) { foreach ($projects as $project) {
$summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId());
@ -79,15 +85,16 @@ class WidgetAllProjectsController extends Controller
$failure = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_FAILED); $failure = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_FAILED);
$successes[$project->getId()] = $success; $successes[$project->getId()] = $success;
$failures[$project->getId()] = $failure; $failures[$project->getId()] = $failure;
} }
$view = new b8\View('WidgetAllProjects/index-projects'); $view = new View('WidgetAllProjects/index-projects');
$view->projects = $projects;
$view->builds = $summaryBuilds; $view->projects = $projects;
$view->builds = $summaryBuilds;
$view->successful = $successes; $view->successful = $successes;
$view->failed = $failures; $view->failed = $failures;
$view->counts = $counts; $view->counts = $counts;
return $view->render(); return $view->render();
} }
@ -104,9 +111,11 @@ class WidgetAllProjectsController extends Controller
foreach ($groups['items'] as $group) { foreach ($groups['items'] as $group) {
$thisGroup = ['title' => $group->getTitle()]; $thisGroup = ['title' => $group->getTitle()];
$projects = $this->projectStore->getByGroupId($group->getId(), false); $projects = $this->projectStore->getByGroupId($group->getId(), false);
$thisGroup['projects'] = $projects['items']; $thisGroup['projects'] = $projects['items'];
$thisGroup['summary'] = $this->getSummaryHtml($thisGroup['projects']); $thisGroup['summary'] = $this->getSummaryHtml($thisGroup['projects']);
$rtn[] = $thisGroup; $rtn[] = $thisGroup;
} }
@ -114,9 +123,9 @@ class WidgetAllProjectsController extends Controller
} }
/** /**
* @param int $projectId * @param integer $projectId
* *
* @return b8\Http\Response * @return Response
*/ */
public function update($projectId) public function update($projectId)
{ {
@ -129,11 +138,11 @@ class WidgetAllProjectsController extends Controller
); );
$counts = $count['count']; $counts = $count['count'];
$this->view->project = $this->projectStore->getById($projectId); $this->view->project = $this->projectStore->getById($projectId);
$this->view->builds = $this->buildStore->getLatestBuilds($projectId); $this->view->builds = $this->buildStore->getLatestBuilds($projectId);
$this->view->successful = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_SUCCESS); $this->view->successful = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_SUCCESS);
$this->view->failed = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_FAILED); $this->view->failed = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_FAILED);
$this->view->counts = $counts; $this->view->counts = $counts;
$this->response->disableLayout(); $this->response->disableLayout();
$this->response->setContent($this->view->render()); $this->response->setContent($this->view->render());

View file

@ -2,11 +2,12 @@
namespace PHPCensor\Controller; namespace PHPCensor\Controller;
use b8; use b8\Store\Factory;
use PHPCensor\BuildFactory; use b8\View;
use PHPCensor\Helper\Lang; use b8\Http\Response;
use PHPCensor\Model\Build;
use PHPCensor\Controller; use PHPCensor\Controller;
use PHPCensor\Store\BuildStore;
use PHPCensor\Store\ProjectStore;
/** /**
* Widget Build Errors Controller * Widget Build Errors Controller
@ -14,12 +15,12 @@ use PHPCensor\Controller;
class WidgetBuildErrorsController extends Controller class WidgetBuildErrorsController extends Controller
{ {
/** /**
* @var \PHPCensor\Store\BuildStore * @var BuildStore
*/ */
protected $buildStore; protected $buildStore;
/** /**
* @var \PHPCensor\Store\ProjectStore * @var ProjectStore
*/ */
protected $projectStore; protected $projectStore;
@ -28,16 +29,17 @@ class WidgetBuildErrorsController extends Controller
*/ */
public function init() public function init()
{ {
$this->buildStore = b8\Store\Factory::getStore('Build'); $this->buildStore = Factory::getStore('Build');
$this->projectStore = b8\Store\Factory::getStore('Project'); $this->projectStore = Factory::getStore('Project');
} }
/** /**
* Display dashboard: * Display dashboard.
*/ */
public function index() public function index()
{ {
$view = new b8\View('WidgetBuildErrors/update'); $view = new View('WidgetBuildErrors/update');
$this->view->projects = $this->renderAllProjectsLatestBuilds($view); $this->view->projects = $this->renderAllProjectsLatestBuilds($view);
$this->response->disableLayout(); $this->response->disableLayout();
@ -47,7 +49,7 @@ class WidgetBuildErrorsController extends Controller
} }
/** /**
* @return b8\Http\Response * @return Response
*/ */
public function update() public function update()
{ {
@ -58,7 +60,8 @@ class WidgetBuildErrorsController extends Controller
} }
/** /**
* @param b8\View $view * @param View $view
*
* @return string * @return string
*/ */
protected function renderAllProjectsLatestBuilds($view) protected function renderAllProjectsLatestBuilds($view)
@ -66,7 +69,7 @@ class WidgetBuildErrorsController extends Controller
$builds = $this->buildStore->getAllProjectsLatestBuilds(); $builds = $this->buildStore->getAllProjectsLatestBuilds();
$view->builds = $builds['projects']; $view->builds = $builds['projects'];
$projects = $this->projectStore->getByIds(array_keys($builds['projects'])); $projects = $this->projectStore->getByIds(array_keys($builds['projects']));
$view_projects = []; $view_projects = [];
foreach($projects as $id => $project) { foreach($projects as $id => $project) {

View file

@ -2,11 +2,12 @@
namespace PHPCensor\Controller; namespace PHPCensor\Controller;
use b8; use b8\Store\Factory;
use b8\View;
use b8\Http\Response;
use PHPCensor\BuildFactory; use PHPCensor\BuildFactory;
use PHPCensor\Helper\Lang;
use PHPCensor\Model\Build;
use PHPCensor\Controller; use PHPCensor\Controller;
use PHPCensor\Store\BuildStore;
/** /**
* Widget Last Builds Controller * Widget Last Builds Controller
@ -14,7 +15,7 @@ use PHPCensor\Controller;
class WidgetLastBuildsController extends Controller class WidgetLastBuildsController extends Controller
{ {
/** /**
* @var \PHPCensor\Store\BuildStore * @var BuildStore
*/ */
protected $buildStore; protected $buildStore;
@ -23,11 +24,11 @@ class WidgetLastBuildsController extends Controller
*/ */
public function init() public function init()
{ {
$this->buildStore = b8\Store\Factory::getStore('Build'); $this->buildStore = Factory::getStore('Build');
} }
/** /**
* Display dashboard: * Display dashboard.
*/ */
public function index() public function index()
{ {
@ -37,9 +38,9 @@ class WidgetLastBuildsController extends Controller
$build = BuildFactory::getBuild($build); $build = BuildFactory::getBuild($build);
} }
$view = new b8\View('WidgetLastBuilds/update'); $view = new View('WidgetLastBuilds/update');
$view->builds = $builds;
$view->builds = $builds;
$this->view->timeline = $view->render(); $this->view->timeline = $view->render();
$this->response->disableLayout(); $this->response->disableLayout();
@ -48,6 +49,9 @@ class WidgetLastBuildsController extends Controller
return $this->response; return $this->response;
} }
/**
* @return Response
*/
public function update() public function update()
{ {
$builds = $this->buildStore->getLatestBuilds(null, 10); $builds = $this->buildStore->getLatestBuilds(null, 10);

View file

@ -1,7 +1,7 @@
<?php <?php
return [ return [
'language_name' => 'Pусский', 'language_name' => 'Русский',
'language' => 'Язык', 'language' => 'Язык',
'per_page' => 'Количество элементов на странице', 'per_page' => 'Количество элементов на странице',
'default' => 'По умолчанию', 'default' => 'По умолчанию',
@ -75,6 +75,7 @@ PHP Censor',
'last_failed_build' => ' Последней проваленной сборкой была %s.', 'last_failed_build' => ' Последней проваленной сборкой была %s.',
'never_failed_build' => ' У этого проекта никогда не было проваленных сборок.', 'never_failed_build' => ' У этого проекта никогда не было проваленных сборок.',
'view_project' => 'Обзор проекта', 'view_project' => 'Обзор проекта',
'projects_with_build_errors' => 'Ошибки сборки',
// Timeline: // Timeline:
'latest_builds' => 'Последние сборки', 'latest_builds' => 'Последние сборки',