From 661dd5c600c1ed42e1b1998a56d663aaa37e4e09 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 | 12 ++++++------ Models/Promotion.php | 2 +- Models/PromotionMapper.php | 5 ----- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index a09a71d..243925d 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 dd0c453..4e937bc 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -42,7 +42,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMarketingPromotionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewMarketingPromotionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-list'); @@ -64,9 +64,9 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMarketingPromotionProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewMarketingPromotionProfile(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'); @@ -102,7 +102,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMarketingPromotionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewMarketingPromotionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-create'); @@ -121,7 +121,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMarketingEventList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewMarketingEventList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Marketing/Theme/Backend/event-list'); @@ -140,7 +140,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMarketingEventCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + public function viewMarketingEventCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Marketing/Theme/Backend/event-create'); diff --git a/Models/Promotion.php b/Models/Promotion.php index e982b19..901e2d1 100644 --- a/Models/Promotion.php +++ b/Models/Promotion.php @@ -55,7 +55,7 @@ class Promotion /** * Created at. * - * @var \Datetime + * @var \DateTime * @since 1.0.0 */ private $createdAt = null; diff --git a/Models/PromotionMapper.php b/Models/PromotionMapper.php index 4e015fd..34b538a 100644 --- a/Models/PromotionMapper.php +++ b/Models/PromotionMapper.php @@ -57,11 +57,6 @@ final class PromotionMapper extends DataMapperAbstract * * @var array> * @since 1.0.0 - */ /** - * Has many relation. - * - * @var array> - * @since 1.0.0 */ protected static $hasMany = [ 'tasks' => [