From a9c54d2527e7f1d9be35fb665364d42805588f71 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 7 Feb 2019 00:05:31 +0100 Subject: [PATCH] phpcs+phpstan fixes --- Admin/Install/Navigation.php | 2 +- Controller/BackendController.php | 21 +++++++++++---------- Templates/Permission/Workflow.php | 8 ++++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index e1562a1..fbe2ff0 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -36,7 +36,7 @@ class Navigation * * @since 1.0.0 */ - public static function install(string $path = null, DatabasePool $dbPool = null) : void + public static function install(string $path, DatabasePool $dbPool) : void { \Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3f7d38a..4c8ff00 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace Modules\Workflow\Controller; +use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -33,12 +34,12 @@ final class BackendController extends Controller * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return \Serializable + * @return RenderableInterface * * @since 1.0.0 * @codeCoverageIgnore */ - public function viewWorkflowTemplates(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewWorkflowTemplates(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-list'); @@ -52,12 +53,12 @@ final class BackendController extends Controller * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return \Serializable + * @return RenderableInterface * * @since 1.0.0 * @codeCoverageIgnore */ - public function viewWorkflowTemplate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewWorkflowTemplate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/task-single'); @@ -71,12 +72,12 @@ final class BackendController extends Controller * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return \Serializable + * @return RenderableInterface * * @since 1.0.0 * @codeCoverageIgnore */ - public function viewWorkflowSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewWorkflowSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/task-create'); @@ -90,12 +91,12 @@ final class BackendController extends Controller * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return \Serializable + * @return RenderableInterface * * @since 1.0.0 * @codeCoverageIgnore */ - public function viewWorkflowTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewWorkflowTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-template-create'); @@ -109,12 +110,12 @@ final class BackendController extends Controller * @param ResponseAbstract $response Response * @param mixed $data Generic data * - * @return \Serializable + * @return RenderableInterface * * @since 1.0.0 * @codeCoverageIgnore */ - public function viewWorkflowDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewWorkflowDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Workflow/Theme/Backend/workflow-dashboard'); diff --git a/Templates/Permission/Workflow.php b/Templates/Permission/Workflow.php index 415b50b..43cf733 100644 --- a/Templates/Permission/Workflow.php +++ b/Templates/Permission/Workflow.php @@ -4,7 +4,7 @@ * * PHP Version 7.2 * - * @package Modules\Media + * @package Modules\Workflow * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 @@ -12,16 +12,16 @@ */ declare(strict_types=1); -namespace Modules\Media; +namespace Modules\Workflow\Templates\Permission; use Modules\Workflow\Models\WorkflowInterface; use Modules\Workflow\Templates\Permission\States; use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; /** - * Media class. + * Workflow class. * - * @package Modules\Media + * @package Modules\Workflow * @license OMS License 1.0 * @link http://website.orange-management.de * @since 1.0.0