Code style fixes.

2017-11-09 20:51:07 +07:00 · 2017-11-09 20:51:07 +07:00 · cd6bfa5942
parent 92fe16e75e
commit cd6bfa5942
5 changed files with 69 additions and 52 deletions
--- a/src/PHPCensor/Controller/WebhookController.php
+++ b/src/PHPCensor/Controller/WebhookController.php
@ -722,7 +722,7 @@ class WebhookController extends Controller
    /**
     * 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
     *
     * @return Project
@ -736,7 +736,7 @@ class WebhookController extends Controller
        }

        if (is_numeric($projectId)) {
-            $project = $this->projectStore->getById($projectId);
+            $project = $this->projectStore->getById((integer)$projectId);
        } else {
            $projects = $this->projectStore->getByTitle($projectId, 2);
            if ($projects['count'] < 1) {
--- a/src/PHPCensor/Controller/WidgetAllProjectsController.php
+++ b/src/PHPCensor/Controller/WidgetAllProjectsController.php
@ -2,11 +2,15 @@

 namespace PHPCensor\Controller;

-use b8;
-use PHPCensor\BuildFactory;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 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
@ -14,17 +18,17 @@ use PHPCensor\Controller;
 class WidgetAllProjectsController extends Controller
 {
    /**
-     * @var \PHPCensor\Store\BuildStore
+     * @var BuildStore
     */
    protected $buildStore;

    /**
-     * @var \PHPCensor\Store\ProjectStore
+     * @var ProjectStore
     */
    protected $projectStore;

    /**
-     * @var \PHPCensor\Store\ProjectGroupStore
+     * @var ProjectGroupStore
     */
    protected $groupStore;

@ -33,13 +37,13 @@ class WidgetAllProjectsController extends Controller
     */
    public function init()
    {
-        $this->buildStore = b8\Store\Factory::getStore('Build');
-        $this->projectStore = b8\Store\Factory::getStore('Project');
-        $this->groupStore = b8\Store\Factory::getStore('ProjectGroup');
+        $this->buildStore   = Factory::getStore('Build');
+        $this->projectStore = Factory::getStore('Project');
+        $this->groupStore   = Factory::getStore('ProjectGroup');
    }

    /**
-    * Display dashboard:
+    * Display dashboard.
    */
    public function index()
    {
@ -53,15 +57,17 @@ class WidgetAllProjectsController extends Controller

    /**
     * Generate the HTML for the project overview section of the dashboard.
-     * @param $projects
+     *
+     * @param Project[] $projects
+     *
     * @return string
     */
    protected function getSummaryHtml($projects)
    {
        $summaryBuilds = [];
-        $successes = [];
-        $failures = [];
-        $counts = [];
+        $successes     = [];
+        $failures      = [];
+        $counts        = [];

        foreach ($projects as $project) {
            $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);

            $successes[$project->getId()] = $success;
-            $failures[$project->getId()] = $failure;
+            $failures[$project->getId()]  = $failure;
        }

-        $view = new b8\View('WidgetAllProjects/index-projects');
-        $view->projects = $projects;
-        $view->builds = $summaryBuilds;
+        $view = new View('WidgetAllProjects/index-projects');
+
+        $view->projects   = $projects;
+        $view->builds     = $summaryBuilds;
        $view->successful = $successes;
-        $view->failed = $failures;
-        $view->counts = $counts;
+        $view->failed     = $failures;
+        $view->counts     = $counts;

        return $view->render();
    }
@ -104,9 +111,11 @@ class WidgetAllProjectsController extends Controller

        foreach ($groups['items'] as $group) {
            $thisGroup = ['title' => $group->getTitle()];
-            $projects = $this->projectStore->getByGroupId($group->getId(), false);
+            $projects  = $this->projectStore->getByGroupId($group->getId(), false);
+
            $thisGroup['projects'] = $projects['items'];
-            $thisGroup['summary'] = $this->getSummaryHtml($thisGroup['projects']);
+            $thisGroup['summary']  = $this->getSummaryHtml($thisGroup['projects']);
+
            $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)
    {
@ -129,11 +138,11 @@ class WidgetAllProjectsController extends Controller
        );
        $counts = $count['count'];

-        $this->view->project = $this->projectStore->getById($projectId);
-        $this->view->builds = $this->buildStore->getLatestBuilds($projectId);
+        $this->view->project    = $this->projectStore->getById($projectId);
+        $this->view->builds     = $this->buildStore->getLatestBuilds($projectId);
        $this->view->successful = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_SUCCESS);
-        $this->view->failed = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_FAILED);
-        $this->view->counts = $counts;
+        $this->view->failed     = $this->buildStore->getLastBuildByStatus($projectId, Build::STATUS_FAILED);
+        $this->view->counts     = $counts;

        $this->response->disableLayout();
        $this->response->setContent($this->view->render());
--- a/src/PHPCensor/Controller/WidgetBuildErrorsController.php
+++ b/src/PHPCensor/Controller/WidgetBuildErrorsController.php
@ -2,11 +2,12 @@

 namespace PHPCensor\Controller;

-use b8;
-use PHPCensor\BuildFactory;
-use PHPCensor\Helper\Lang;
-use PHPCensor\Model\Build;
+use b8\Store\Factory;
+use b8\View;
+use b8\Http\Response;
 use PHPCensor\Controller;
+use PHPCensor\Store\BuildStore;
+use PHPCensor\Store\ProjectStore;

 /**
 * Widget Build Errors Controller
@ -14,12 +15,12 @@ use PHPCensor\Controller;
 class WidgetBuildErrorsController extends Controller
 {
    /**
-     * @var \PHPCensor\Store\BuildStore
+     * @var BuildStore
     */
    protected $buildStore;

    /**
-     * @var \PHPCensor\Store\ProjectStore
+     * @var ProjectStore
     */
    protected $projectStore;

@ -28,16 +29,17 @@ class WidgetBuildErrorsController extends Controller
     */
    public function init()
    {
-        $this->buildStore = b8\Store\Factory::getStore('Build');
-        $this->projectStore = b8\Store\Factory::getStore('Project');
+        $this->buildStore   = Factory::getStore('Build');
+        $this->projectStore = Factory::getStore('Project');
    }

    /**
-    * Display dashboard:
+    * Display dashboard.
    */
    public function index()
    {
-        $view = new b8\View('WidgetBuildErrors/update');
+        $view = new View('WidgetBuildErrors/update');
+
        $this->view->projects = $this->renderAllProjectsLatestBuilds($view);

        $this->response->disableLayout();
@ -47,7 +49,7 @@ class WidgetBuildErrorsController extends Controller
    }

    /**
-     * @return b8\Http\Response
+     * @return Response
     */
    public function update()
    {
@ -58,7 +60,8 @@ class WidgetBuildErrorsController extends Controller
    }

    /**
-     * @param b8\View $view
+     * @param View $view
+     *
     * @return string
     */
    protected function renderAllProjectsLatestBuilds($view)
@ -66,7 +69,7 @@ class WidgetBuildErrorsController extends Controller
        $builds = $this->buildStore->getAllProjectsLatestBuilds();

        $view->builds = $builds['projects'];
-        $projects = $this->projectStore->getByIds(array_keys($builds['projects']));
+        $projects     = $this->projectStore->getByIds(array_keys($builds['projects']));

        $view_projects = [];
        foreach($projects as $id => $project) {
--- a/src/PHPCensor/Controller/WidgetLastBuildsController.php
+++ b/src/PHPCensor/Controller/WidgetLastBuildsController.php
@ -2,11 +2,12 @@

 namespace PHPCensor\Controller;

-use b8;
+use b8\Store\Factory;
+use b8\View;
+use b8\Http\Response;
 use PHPCensor\BuildFactory;
-use PHPCensor\Helper\Lang;
-use PHPCensor\Model\Build;
 use PHPCensor\Controller;
+use PHPCensor\Store\BuildStore;

 /**
 * Widget Last Builds Controller
@ -14,7 +15,7 @@ use PHPCensor\Controller;
 class WidgetLastBuildsController extends Controller
 {
    /**
-     * @var \PHPCensor\Store\BuildStore
+     * @var BuildStore
     */
    protected $buildStore;

@ -23,11 +24,11 @@ class WidgetLastBuildsController extends Controller
     */
    public function init()
    {
-        $this->buildStore = b8\Store\Factory::getStore('Build');
+        $this->buildStore = Factory::getStore('Build');
    }

    /**
-    * Display dashboard:
+    * Display dashboard.
    */
    public function index()
    {
@ -37,9 +38,9 @@ class WidgetLastBuildsController extends Controller
            $build = BuildFactory::getBuild($build);
        }

-        $view = new b8\View('WidgetLastBuilds/update');
-        $view->builds = $builds;
+        $view = new View('WidgetLastBuilds/update');

+        $view->builds         = $builds;
        $this->view->timeline = $view->render();

        $this->response->disableLayout();
@ -48,6 +49,9 @@ class WidgetLastBuildsController extends Controller
        return $this->response;
    }

+    /**
+     * @return Response
+     */
    public function update()
    {
        $builds = $this->buildStore->getLatestBuilds(null, 10);
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@ -1,7 +1,7 @@
 <?php

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

    // Timeline:
    'latest_builds' => 'Последние сборки',