From 8770eac2eae68320580a821742f19208d789a7e4 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 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 194e86c..6bbd332 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 cd348c4..6e25b37 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace Modules\Help\Controller; +use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Utils\Parser\Markdown\Markdown; @@ -34,12 +35,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 viewHelp(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewHelp(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Help/Theme/Backend/help'); @@ -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 viewHelpGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewHelpGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $path = $this->getHelpGeneralPath($request); @@ -105,12 +106,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 viewHelpModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewHelpModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Help/Theme/Backend/help-module-list'); @@ -123,12 +124,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 viewHelpModule(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewHelpModule(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $active = $this->app->moduleManager->getActiveModules(); @@ -182,12 +183,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 viewHelpDeveloper(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewHelpDeveloper(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $path = $this->getHelpDeveloperPath($request);