Type and cs fixes

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 = [

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;
 
 /**

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 = [

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}