From 99d795a7df88b9893e85b81116f84d4c971ab3b8 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 +++++++++++---------- Models/TaskElementMapper.php | 5 ----- Models/TaskMapper.php | 5 ----- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 369ccac..5d26e87 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 a065d81..9e9473c 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -20,6 +20,7 @@ use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Views\TaskView; use phpOMS\Account\PermissionType; +use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; @@ -41,12 +42,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 viewTaskDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewTaskDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); @@ -66,12 +67,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 viewDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Tasks/Theme/Backend/dashboard-task'); @@ -92,12 +93,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 viewTaskView(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewTaskView(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new TaskView($this->app, $request, $response); @@ -133,12 +134,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 viewTaskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewTaskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); @@ -159,12 +160,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 viewTaskAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewTaskAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Tasks/Theme/Backend/task-analysis'); diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php index 107354b..61325eb 100644 --- a/Models/TaskElementMapper.php +++ b/Models/TaskElementMapper.php @@ -53,11 +53,6 @@ final class TaskElementMapper extends DataMapperAbstract * * @var array> * @since 1.0.0 - */ /** - * Has many relation. - * - * @var array> - * @since 1.0.0 */ protected static $hasMany = [ 'media' => [ diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php index 763474f..5fbf692 100644 --- a/Models/TaskMapper.php +++ b/Models/TaskMapper.php @@ -59,11 +59,6 @@ final class TaskMapper extends DataMapperAbstract * * @var array> * @since 1.0.0 - */ /** - * Has many relation. - * - * @var array> - * @since 1.0.0 */ protected static $hasMany = [ 'taskElements' => [