From f25facdaec080202e09afd07e3ca5a061d564ab1 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 | 16 +++++++++------- Models/Event.php | 2 +- Models/EventMapper.php | 5 ----- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index a97cc6f..610531e 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 60950d4..a6c0cd4 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,7 +16,9 @@ namespace Modules\EventManagement\Controller; use Modules\EventManagement\Models\Event; use Modules\EventManagement\Models\EventMapper; + use phpOMS\Asset\AssetType; +use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; @@ -37,12 +39,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 viewEventManagementList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewEventManagementList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/EventManagement/Theme/Backend/eventmanagement-list'); @@ -59,12 +61,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 viewEventManagementCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewEventManagementCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/EventManagement/Theme/Backend/eventmanagement-create'); @@ -78,14 +80,14 @@ 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 viewEventManagementProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewEventManagementProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { - /** @var Head $head */ + /** @var \phpOMS\Model\Html\Head $head */ $head = $response->get('Content')->getData('head'); $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css'); diff --git a/Models/Event.php b/Models/Event.php index 03e2982..ef996c7 100644 --- a/Models/Event.php +++ b/Models/Event.php @@ -67,7 +67,7 @@ class Event /** * Created. * - * @var \Datetime + * @var \DateTime * @since 1.0.0 */ private $createdAt = null; diff --git a/Models/EventMapper.php b/Models/EventMapper.php index d64a888..f47840d 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -57,11 +57,6 @@ final class EventMapper extends DataMapperAbstract * * @var array> * @since 1.0.0 - */ /** - * Has many relation. - * - * @var array> - * @since 1.0.0 */ protected static $hasMany = [ 'tasks' => [