From c5252c62b8cddab91344043843bf25821c591288 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 7 Mar 2020 00:23:17 +0100
Subject: [PATCH] Type and cs fixes

---
 Models/CalendarMapper.php                      | 2 +-
 Models/Event.php                               | 2 +-
 Models/EventMapper.php                         | 2 +-
 Theme/Backend/Components/Calendar/BaseView.php | 9 ++++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php
index ce7775a..e92758f 100644
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.php
@@ -46,7 +46,7 @@ final class CalendarMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string}>
+     * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string, column?:string}>
      * @since 1.0.0
      */
     protected static array $hasMany = [
diff --git a/Models/Event.php b/Models/Event.php
index afbc923..c25799a 100644
--- a/Models/Event.php
+++ b/Models/Event.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Calendar\Models;
 
+use Modules\Admin\Models\Account;
 use Modules\Admin\Models\NullAccount;
-use phpOMS\Account\Account;
 use phpOMS\Stdlib\Base\Location;
 
 /**
diff --git a/Models/EventMapper.php b/Models/EventMapper.php
index b344dd8..34dd548 100644
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.php
@@ -49,7 +49,7 @@ final class EventMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array<string, array{mapper:string, self:string, by?:string}>
+     * @var array<string, array{mapper:string, self:string, by?:string, column?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
diff --git a/Theme/Backend/Components/Calendar/BaseView.php b/Theme/Backend/Components/Calendar/BaseView.php
index 7781157..b00cf91 100644
--- a/Theme/Backend/Components/Calendar/BaseView.php
+++ b/Theme/Backend/Components/Calendar/BaseView.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Calendar\Theme\Backend\Components\Calendar;
 
+use Modules\Calendar\Models\Calendar;
 use phpOMS\Localization\L11nManager;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -30,7 +31,13 @@ use phpOMS\Views\View;
  */
 class BaseView extends View
 {
-    protected $calendar = [];
+    /**
+     * Calendar to render
+     *
+     * @var Calendar
+     * @since 1.0.0
+     */
+    protected Calendar $calendar;
 
     /**
      * {@inheritdoc}