From 410571d2e70ee3bb3c034b4adc7102e864affb16 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 | 26 ++++++++++++++------------ Models/Issue.php | 2 +- Models/Message.php | 4 ++-- Models/SupportStatus.php | 2 +- Models/TicketMapper.php | 1 - 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 0872d25..d269a5d 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 9a554b6..4400384 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -15,6 +15,8 @@ declare(strict_types=1); namespace Modules\Support\Controller; use Modules\Support\Models\TicketMapper; + +use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -36,12 +38,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 viewSupportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewSupportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-list'); @@ -58,12 +60,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 viewSupportTicket(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewSupportTicket(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/ticket-single'); @@ -80,12 +82,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 viewSupportCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewSupportCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/ticket-create'); @@ -99,12 +101,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 viewSupportAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewSupportAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-analysis'); @@ -118,12 +120,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 viewSupportSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewSupportSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/support-settings'); @@ -137,12 +139,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 viewPrivateSupportDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewPrivateSupportDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Support/Theme/Backend/user-support-dashboard'); diff --git a/Models/Issue.php b/Models/Issue.php index 97ce726..ac3bb42 100644 --- a/Models/Issue.php +++ b/Models/Issue.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\Support; +namespace Modules\Support\Models; /** * Issue class. diff --git a/Models/Message.php b/Models/Message.php index 80bf9d0..192b9f0 100644 --- a/Models/Message.php +++ b/Models/Message.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\Support; +namespace Modules\Support\Models; /** * Issue class. @@ -44,7 +44,7 @@ class Message /** * Created. * - * @var \Datetime + * @var \DateTime * @since 1.0.0 */ private $created = null; diff --git a/Models/SupportStatus.php b/Models/SupportStatus.php index 2c1fd8c..e15fff6 100644 --- a/Models/SupportStatus.php +++ b/Models/SupportStatus.php @@ -12,7 +12,7 @@ */ declare(strict_types=1); -namespace Modules\Support; +namespace Modules\Support\Models; use phpOMS\Stdlib\Base\Enum; diff --git a/Models/TicketMapper.php b/Models/TicketMapper.php index 23bd201..227f0bf 100644 --- a/Models/TicketMapper.php +++ b/Models/TicketMapper.php @@ -17,7 +17,6 @@ namespace Modules\Support\Models; use Modules\Tasks\Models\TaskMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; - /** * Mapper class. *