diff --git a/application/modules/calendar/boxes/Calendar.php b/application/modules/calendar/boxes/Calendar.php
index 7dbb99255..ca0b178a5 100644
--- a/application/modules/calendar/boxes/Calendar.php
+++ b/application/modules/calendar/boxes/Calendar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/boxes/views/calendar.php b/application/modules/calendar/boxes/views/calendar.php
index 4bd1fd9dd..c924fab55 100644
--- a/application/modules/calendar/boxes/views/calendar.php
+++ b/application/modules/calendar/boxes/views/calendar.php
@@ -38,7 +38,7 @@
             nowIndicator: true,
             height: 450,
             eventSources: [
-                <?php foreach ($this->get('events') ?? [] as $url): ?>
+                <?php foreach ($this->get('events') ?? [] as $url) : ?>
                 {
                     url: '<?=$this->getUrl($url->getUrl()) ?>'
                 },
diff --git a/application/modules/calendar/config/config.php b/application/modules/calendar/config/config.php
index 94264bc03..3ea324d53 100644
--- a/application/modules/calendar/config/config.php
+++ b/application/modules/calendar/config/config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
@@ -115,7 +116,7 @@ public function getInstallSql(): string
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
     }
 
-    public function getUpdate($installedVersion)
+    public function getUpdate(string $installedVersion): string
     {
         switch ($installedVersion) {
             case "1.0":
@@ -234,10 +235,10 @@ public function getUpdate($installedVersion)
                 $boxModel->addContent('calendar', $this->config['boxes']['calendar']);
                 $boxMapper->install($boxModel);
 
-                removeDir(APPLICATION_PATH.'/modules/calendar/static/js/fullcalendar/');
+                removeDir(APPLICATION_PATH . '/modules/calendar/static/js/fullcalendar/');
                 // no break
             case "1.7.0":
-                removeDir(APPLICATION_PATH.'/modules/calendar/static/js/fullcalendar_5_11_0/');
+                removeDir(APPLICATION_PATH . '/modules/calendar/static/js/fullcalendar_5_11_0/');
                 // no break
             case "1.8.0":
                 // Add the uid column. This property defines the persistent, globally unique identifier for the calendar component.
@@ -254,10 +255,13 @@ public function getUpdate($installedVersion)
                 // no break
             case "1.9.2":
                 // Remove old version of fullcalendar as this version comes with version 6.1.10.
-                removeDir(APPLICATION_PATH.'/modules/calendar/static/js/fullcalendar_5_11_3/');
+                removeDir(APPLICATION_PATH . '/modules/calendar/static/js/fullcalendar_5_11_3/');
                 // no break
             case "1.10.0":
                 // no break
+            case "1.11.0":
         }
+
+        return '"' . $this->config['key'] . '" Update-function executed.';
     }
 }
diff --git a/application/modules/calendar/controllers/Events.php b/application/modules/calendar/controllers/Events.php
index f33fd2253..275a089b7 100644
--- a/application/modules/calendar/controllers/Events.php
+++ b/application/modules/calendar/controllers/Events.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/controllers/Index.php b/application/modules/calendar/controllers/Index.php
index f84034994..21d498626 100644
--- a/application/modules/calendar/controllers/Index.php
+++ b/application/modules/calendar/controllers/Index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/controllers/admin/Index.php b/application/modules/calendar/controllers/admin/Index.php
index 92eddc4b5..e5603fa88 100644
--- a/application/modules/calendar/controllers/admin/Index.php
+++ b/application/modules/calendar/controllers/admin/Index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
@@ -61,7 +62,7 @@ public function indexAction()
             }
         }
 
-        $this->getView()->set('calendar', $calendarMapper->getEntries())
+        $this->getView()->set('calendars', $calendarMapper->getEntries())
             ->set('calendarMapper', $calendarMapper);
     }
 
@@ -70,7 +71,7 @@ public function treatAction()
         $calendarMapper = new CalendarMapper();
         $calendarModel = new CalendarModel();
         $groupMapper = new GroupMapper();
-        
+
         if ($this->getRequest()->getParam('id')) {
             $this->getLayout()->getAdminHmenu()
                     ->add($this->getTranslator()->trans('menuCalendar'), ['action' => 'index'])
@@ -108,7 +109,7 @@ public function treatAction()
             }
 
             if ($this->getRequest()->getPost('end')) {
-                $validator['end']= 'required|date:d.m.Y H\:i';
+                $validator['end'] = 'required|date:d.m.Y H\:i';
             }
 
             $validation = Validation::create(
@@ -147,7 +148,7 @@ public function treatAction()
             $this->redirect()
                 ->withInput()
                 ->withErrors($validation->getErrorBag())
-                ->to(array_merge(['action' => 'treat'], ($calendarModel->getId()?['id' => $calendarModel->getId()]:[])));
+                ->to(array_merge(['action' => 'treat'], ($calendarModel->getId() ? ['id' => $calendarModel->getId()] : [])));
         }
 
         if ($calendarModel->getId()) {
diff --git a/application/modules/calendar/layouts/events.php b/application/modules/calendar/layouts/events.php
index 1ec612ffa..50f4cdc88 100644
--- a/application/modules/calendar/layouts/events.php
+++ b/application/modules/calendar/layouts/events.php
@@ -1 +1,5 @@
-<?=$this->getContent() ?>
+<?php
+
+/** @var \Ilch\Layout\Base $this */
+
+echo $this->getContent();
diff --git a/application/modules/calendar/layouts/iCal.php b/application/modules/calendar/layouts/iCal.php
index 1ec612ffa..50f4cdc88 100644
--- a/application/modules/calendar/layouts/iCal.php
+++ b/application/modules/calendar/layouts/iCal.php
@@ -1 +1,5 @@
-<?=$this->getContent() ?>
+<?php
+
+/** @var \Ilch\Layout\Base $this */
+
+echo $this->getContent();
diff --git a/application/modules/calendar/mappers/Calendar.php b/application/modules/calendar/mappers/Calendar.php
index acc7f22fb..fa8f8ceb3 100644
--- a/application/modules/calendar/mappers/Calendar.php
+++ b/application/modules/calendar/mappers/Calendar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
@@ -107,8 +108,8 @@ public function getCalendarById($id): ?EntriesModel
     /**
      * Gets the Calendar entries by start and end.
      *
-     * @param \Ilch\Date|string $start
-     * @param \Ilch\Date|string $end
+     * @param Date|string $start
+     * @param Date|string $end
      * @param string|array $groupIds A string like '1,2,3' or an array like [1,2,3]
      * @return array|null
      */
@@ -119,24 +120,24 @@ public function getEntriesForJson($start, $end, $groupIds = '3'): ?array
         }
 
         if ($start && $end) {
-            if (!is_a($start, \Ilch\Date::class)) {
-                $start = new \Ilch\Date($start);
+            if (!is_a($start, Date::class)) {
+                $start = new Date($start);
             }
-            if (!is_a($end, \Ilch\Date::class)) {
-                $end = new \Ilch\Date($end);
+            if (!is_a($end, Date::class)) {
+                $end = new Date($end);
             }
             $select = $this->db()->select();
             return $this->getEntriesBy(
                 [
                     $select->orX(
                         [
-                            $select->andX(['c.end <=' => $end->format('Y-m-d').' 23:59:59']),
-                            $select->andX(['c.start >=' => $start->format('Y-m-d').' 00:00:00', 'c.end <=' => $end->format('Y-m-d').' 23:59:59']),
+                            $select->andX(['c.end <=' => $end->format('Y-m-d') . ' 23:59:59']),
+                            $select->andX(['c.start >=' => $start->format('Y-m-d') . ' 00:00:00', 'c.end <=' => $end->format('Y-m-d') . ' 23:59:59']),
                             $select->andX(
                                 [
                                     'c.period_type !=' => '',
-                                    'c.start <=' => $end->format('Y-m-d').' 00:00:00',
-                                    $select->orX(['c.end >=' => $start->format('Y-m-d').' 23:59:59', 'c.end =' => '1000-01-01 00:00:00'])
+                                    'c.start <=' => $end->format('Y-m-d') . ' 00:00:00',
+                                    $select->orX(['c.end >=' => $start->format('Y-m-d') . ' 23:59:59', 'c.end =' => '1000-01-01 00:00:00'])
                                 ]
                             )
                         ]
@@ -192,11 +193,11 @@ public function saveReadAccess(int $calendarId, $readAccess, bool $addAdmin = tr
         }
 
         // Delete possible old entries to later insert the new ones.
-        $this->db()->delete($this->tablename.'_access')
+        $this->db()->delete($this->tablename . '_access')
             ->where(['calendar_id' => $calendarId])
             ->execute();
 
-        $sql = 'INSERT INTO [prefix]_'.$this->tablename.'_access (calendar_id, group_id) VALUES';
+        $sql = 'INSERT INTO [prefix]_' . $this->tablename . '_access (calendar_id, group_id) VALUES';
         $sqlWithValues = $sql;
         $rowCount = 0;
         $groupIds = [];
@@ -253,13 +254,13 @@ public function delete($id): bool
      * @param int $factor
      * @return array
      */
-    public function repeat(string $type, \Ilch\Date $startdate, \Ilch\Date $enddate, \Ilch\Date $untilDate, int $factor = 1): array
+    public function repeat(string $type, Date $startdate, Date $enddate, Date $untilDate, int $factor = 1): array
     {
         $recurrences = [];
         $startdateRecurrence = clone $startdate;
         $enddateRecurrence = clone $enddate;
 
-        while($startdateRecurrence <= $untilDate) {
+        while ($startdateRecurrence <= $untilDate) {
             $event = [];
             switch ($type) {
                 case 'monthly':
@@ -276,8 +277,8 @@ public function repeat(string $type, \Ilch\Date $startdate, \Ilch\Date $enddate,
                     break;
                 case 'quarterly':
                     // work with a factor and 3 months as a quarter of a year is 3 months?
-                    $startdateRecurrence->modify(($factor * 3). ' months');
-                    $enddateRecurrence->modify(($factor * 3). ' months');
+                    $startdateRecurrence->modify(($factor * 3) . ' months');
+                    $enddateRecurrence->modify(($factor * 3) . ' months');
                     break;
                 case 'yearly':
                     $startdateRecurrence->modify($factor . ' years');
diff --git a/application/modules/calendar/mappers/Events.php b/application/modules/calendar/mappers/Events.php
index 4f80a7748..58f9cf4e3 100644
--- a/application/modules/calendar/mappers/Events.php
+++ b/application/modules/calendar/mappers/Events.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/models/Calendar.php b/application/modules/calendar/models/Calendar.php
index bbf6897fc..8ddaad4e1 100644
--- a/application/modules/calendar/models/Calendar.php
+++ b/application/modules/calendar/models/Calendar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/models/Events.php b/application/modules/calendar/models/Events.php
index 731036c4a..d8572a76d 100644
--- a/application/modules/calendar/models/Events.php
+++ b/application/modules/calendar/models/Events.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/translations/de.php b/application/modules/calendar/translations/de.php
index 743ddd32f..0548975a5 100644
--- a/application/modules/calendar/translations/de.php
+++ b/application/modules/calendar/translations/de.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/translations/en.php b/application/modules/calendar/translations/en.php
index 8eb68d1f8..8e94809bf 100644
--- a/application/modules/calendar/translations/en.php
+++ b/application/modules/calendar/translations/en.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/calendar/views/admin/index/index.php b/application/modules/calendar/views/admin/index/index.php
index d6c82c145..2b5cec7b5 100644
--- a/application/modules/calendar/views/admin/index/index.php
+++ b/application/modules/calendar/views/admin/index/index.php
@@ -1,4 +1,7 @@
 <?php
+
+/** @var \Ilch\View $this */
+
 $periodDays = [
     '1' => $this->getTranslator()->trans('Monday'),
     '2' => $this->getTranslator()->trans('Tuesday'),
@@ -19,7 +22,7 @@
 ?>
 
 <h1><?=$this->getTrans('manage') ?></h1>
-<?php if ($this->get('calendar') != ''): ?>
+<?php if ($this->get('calendars') != '') : ?>
     <form method="POST" action="">
         <?=$this->getTokenField() ?>
         <div class="table-responsive">
@@ -47,8 +50,10 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($this->get('calendar') as $calendar): ?>
                     <?php
+                    /** @var \Modules\Calendar\Models\Calendar $calendar */
+                    foreach ($this->get('calendars') as $calendar) : ?>
+                        <?php
                         $startDate = new \Ilch\Date($calendar->getStart());
                         $endDate = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getEnd()) : 1;
                         $endDate = is_numeric($endDate) ? null : $endDate;
@@ -63,10 +68,10 @@
                                 <?php
                                 if ($calendar->getPeriodType()) {
                                     echo $periodTypes[$calendar->getPeriodType()];
-                                    if ($calendar->getPeriodType() != 'days'){
-                                        echo ' (x '.$calendar->getPeriodDay().')';
+                                    if ($calendar->getPeriodType() != 'days') {
+                                        echo ' (x ' . $calendar->getPeriodDay() . ')';
                                     } else {
-                                        echo ' ('.$periodDays[$calendar->getPeriodDay()].')';
+                                        echo ' (' . $periodDays[$calendar->getPeriodDay()] . ')';
                                     }
                                 }
                                 ?>
@@ -80,6 +85,6 @@
         </div>
         <?=$this->getListBar(['delete' => 'delete']) ?>
     </form>
-<?php else: ?>
+<?php else : ?>
     <?=$this->getTrans('noCalendar') ?>
 <?php endif; ?>
diff --git a/application/modules/calendar/views/admin/index/treat.php b/application/modules/calendar/views/admin/index/treat.php
index c1faefeca..dd7cc91de 100644
--- a/application/modules/calendar/views/admin/index/treat.php
+++ b/application/modules/calendar/views/admin/index/treat.php
@@ -1,4 +1,7 @@
 <?php
+
+/** @var \Ilch\View $this */
+
 $periodDays = [
     '1' => $this->getTranslator()->trans('Monday'),
     '2' => $this->getTranslator()->trans('Tuesday'),
@@ -26,8 +29,9 @@
     'days' => $this->getTranslator()->trans('days'),
 ];
 
+/** @var \Modules\Calendar\Models\Calendar $entry */
 $entry = $this->get('calendar');
- ?>
+?>
 
 <link href="<?=$this->getStaticUrl('js/tempus-dominus/dist/css/tempus-dominus.min.css') ?>" rel="stylesheet">
 
@@ -45,7 +49,7 @@
                    class="form-control"
                    id="start"
                    name="start"
-                   value="<?=$this->escape($this->originalInput('start', ($entry->getId()?(new \Ilch\Date($entry->getStart()))->format('d.m.Y H:i'):''))) ?>"
+                   value="<?=$this->escape($this->originalInput('start', ($entry->getId() ? (new \Ilch\Date($entry->getStart()))->format('d.m.Y H:i') : ''))) ?>"
                    readonly>
             <span class="input-group-text">
                 <span class="fa-solid fa-calendar"></span>
@@ -61,7 +65,7 @@ class="form-control"
                    class="form-control"
                    id="end"
                    name="end"
-                   value="<?=$this->escape($this->originalInput('end', ($entry->getId()?($entry->getEnd() != '1000-01-01 00:00:00' ? (new \Ilch\Date($entry->getEnd()))->format('d.m.Y H:i') : ''):''))) ?>">
+                   value="<?=$this->escape($this->originalInput('end', ($entry->getId() ? ($entry->getEnd() != '1000-01-01 00:00:00' ? (new \Ilch\Date($entry->getEnd()))->format('d.m.Y H:i') : '') : ''))) ?>">
             <span class="input-group-text">
                 <span class="fa-solid fa-calendar"></span>
             </span>
@@ -76,7 +80,7 @@ class="form-control"
                    class="form-control"
                    id="title"
                    name="title"
-                   value="<?=$this->escape($this->originalInput('title', ($entry->getId()?$entry->getTitle():''))) ?>" />
+                   value="<?=$this->escape($this->originalInput('title', ($entry->getId() ? $entry->getTitle() : ''))) ?>" />
         </div>
     </div>
     <div class="row mb-3<?=$this->validation()->hasError('place') ? ' has-error' : '' ?>">
@@ -88,7 +92,7 @@ class="form-control"
                    class="form-control"
                    id="place"
                    name="place"
-                   value="<?=$this->escape($this->originalInput('place', ($entry->getId()?$entry->getPlace():''))) ?>" />
+                   value="<?=$this->escape($this->originalInput('place', ($entry->getId() ? $entry->getPlace() : ''))) ?>" />
         </div>
     </div>
     <div class="row mb-3<?=$this->validation()->hasError('periodType') ? ' has-error' : '' ?>">
@@ -97,9 +101,9 @@ class="form-control"
         </label>
         <div class="col-xl-4">
             <select class="form-select" name="periodType" id="periodType">
-                <option value="" <?=($this->originalInput('periodType', ($entry->getId()?$entry->getPeriodType():''))) == '' ? 'selected=""' : '' ?>><?=$this->getTrans('noPeriodEntry') ?></option>
-                <?php foreach ($periodTypes as $key => $value): ?>
-                    <option value="<?=$key ?>" <?=($this->originalInput('periodType', ($entry->getId()?$entry->getPeriodType():''))) == $key ? 'selected=""' : '' ?>><?=$value ?></option>
+                <option value="" <?=($this->originalInput('periodType', ($entry->getId() ? $entry->getPeriodType() : ''))) == '' ? 'selected=""' : '' ?>><?=$this->getTrans('noPeriodEntry') ?></option>
+                <?php foreach ($periodTypes as $key => $value) : ?>
+                    <option value="<?=$key ?>" <?=($this->originalInput('periodType', ($entry->getId() ? $entry->getPeriodType() : ''))) == $key ? 'selected=""' : '' ?>><?=$value ?></option>
                 <?php endforeach; ?>
             </select>
         </div>
@@ -109,9 +113,9 @@ class="form-control"
         <label for="periodDays" class="col-xl-2 col-form-label"></label>
         <div class="col-xl-4">
             <select class="form-select" name="periodDays" id="periodDays">
-                <option value="0" <?=($this->originalInput('periodDay', ($entry->getId()?$entry->getPeriodDay():'0'))) == '0' ? 'selected=""' : '' ?>><?=$this->getTrans('noPeriodEntry') ?></option>
-                <?php foreach ($periodDays as $key => $value): ?>
-                    <option value="<?=$key ?>" <?=($this->originalInput('periodDay', ($entry->getId()?$entry->getPeriodDay():'0'))) == $key ? 'selected=""' : '' ?>><?=$value ?></option>
+                <option value="0" <?=($this->originalInput('periodDay', ($entry->getId() ? $entry->getPeriodDay() : '0'))) == '0' ? 'selected=""' : '' ?>><?=$this->getTrans('noPeriodEntry') ?></option>
+                <?php foreach ($periodDays as $key => $value) : ?>
+                    <option value="<?=$key ?>" <?=($this->originalInput('periodDay', ($entry->getId() ? $entry->getPeriodDay() : '0'))) == $key ? 'selected=""' : '' ?>><?=$value ?></option>
                 <?php endforeach; ?>
             </select>
         </div>
@@ -126,7 +130,7 @@ class="form-control"
                    class="form-control"
                    id="periodDay"
                    name="periodDay"
-                   value="<?=$this->escape($this->originalInput('periodDay', ($this->originalInput('periodType', ($entry->getId()?$entry->getPeriodType():'')) == 'days'?'0':($entry->getId()?$entry->getPeriodDay():'1')))) ?>" />
+                   value="<?=$this->escape($this->originalInput('periodDay', ($this->originalInput('periodType', ($entry->getId() ? $entry->getPeriodType() : '')) == 'days' ? '0' : ($entry->getId() ? $entry->getPeriodDay() : '1')))) ?>" />
             <span class="input-group-text" id="periodDayAppendix"><?=(!empty($entry->getPeriodType())) ? $this->getTrans($periodAppendix[$entry->getPeriodType()]) : '' ?></span>
         </div>
       </div>
@@ -142,7 +146,7 @@ class="form-control"
                    class="form-control"
                    id="repeatUntil"
                    name="repeatUntil"
-                   value="<?=$this->escape($this->originalInput('repeatUntil', ($entry->getId()?($entry->getRepeatUntil() != '1000-01-01 00:00:00' ? (new \Ilch\Date($entry->getRepeatUntil()))->format('d.m.Y H:i') : ''):''))) ?>"
+                   value="<?=$this->escape($this->originalInput('repeatUntil', ($entry->getId() ? ($entry->getRepeatUntil() != '1000-01-01 00:00:00' ? (new \Ilch\Date($entry->getRepeatUntil()))->format('d.m.Y H:i') : '') : ''))) ?>"
                    readonly>
             <span class="input-group-text">
                 <span class="fa-solid fa-calendar"></span>
@@ -160,7 +164,7 @@ class="form-control"
                    id="color"
                    name="color"
                    data-jscolor=""
-                   value="<?=$this->escape($this->originalInput('color', ($entry->getId()?$entry->getColor():'#32333B'))) ?>">
+                   value="<?=$this->escape($this->originalInput('color', ($entry->getId() ? $entry->getColor() : '#32333B'))) ?>">
             <span class="input-group-text">
                 <span class="fa-solid fa-arrow-rotate-left" onclick="document.getElementById('color').jscolor.fromString('32333B')"></span>
             </span>
@@ -173,9 +177,11 @@ class="form-control"
         <div class="col-xl-4">
             <select class="chosen-select form-control" id="access" name="groups[]" data-placeholder="<?=$this->getTrans('selectAssignedGroups') ?>" multiple>
                 <option value="all" <?=in_array('all', $this->originalInput('groups', $this->get('groups'))) ? 'selected="selected"' : '' ?>><?=$this->getTrans('groupAll') ?></option>
-                <?php foreach ($this->get('userGroupList') as $groupList): ?>
-                    <?php if ($groupList->getId() != 1): ?>
-                        <option value="<?=$groupList->getId() ?>" <?=in_array($groupList->getId(), $this->originalInput('groups', $this->get('groups'))) ? 'selected=""' : '' ?>><?=$groupList->getName() ?></option>
+                <?php
+                /** @var \Modules\Calendar\Models\Calendar $entry */
+                foreach ($this->get('userGroupList') as $group) : ?>
+                    <?php if ($group->getId() != 1) : ?>
+                        <option value="<?=$group->getId() ?>" <?=in_array($group->getId(), $this->originalInput('groups', $this->get('groups'))) ? 'selected=""' : '' ?>><?=$group->getName() ?></option>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </select>
@@ -190,7 +196,7 @@ class="form-control"
                       id="ck_1"
                       name="text"
                       toolbar="ilch_html"
-                      rows="5"><?=$this->escape($this->originalInput('text', ($entry->getId()?$entry->getText():''))) ?></textarea>
+                      rows="5"><?=$this->escape($this->originalInput('text', ($entry->getId() ? $entry->getText() : ''))) ?></textarea>
         </div>
     </div>
     <?=($entry->getId()) ? $this->getSaveBar('updateButton') : $this->getSaveBar('addButton') ?>
diff --git a/application/modules/calendar/views/events/iCal.php b/application/modules/calendar/views/events/iCal.php
index 2f67c2a03..e01fa47b5 100644
--- a/application/modules/calendar/views/events/iCal.php
+++ b/application/modules/calendar/views/events/iCal.php
@@ -1,4 +1,7 @@
 <?php
+
+/** @var \Ilch\View $this */
+
 header('Content-type: text/calendar; charset=utf-8');
 header('Content-Disposition: inline; filename=cal.ics');
 
@@ -11,10 +14,11 @@
 
 $displayedEntries = 0;
 
-foreach ($this->get('calendarList') ?? [] as $calendarList) {
+/** @var \Modules\Calendar\Models\Calendar $calendar */
+foreach ($this->get('calendarList') ?? [] as $calendar) {
     $displayedEntries++;
 
-    $description = $calendarList->getText();
+    $description = $calendar->getText();
     $description = strip_tags($description, '<p><br>');
     $description = str_replace('<p>', '', $description);
     $description = str_replace('</p>', "\\n\\n", $description);
@@ -22,26 +26,26 @@
     $description = str_replace(["\r", "\n"], '', $description);
     $description = rtrim(trim($description), "\\n\\n");
 
-    $startDate = new \Ilch\Date($calendarList->getStart());
-    $endDate = $calendarList->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendarList->getEnd()) : 1;
-    $repeatUntil = $calendarList->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendarList->getRepeatUntil()) : 1;
+    $startDate = new \Ilch\Date($calendar->getStart());
+    $endDate = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getEnd()) : 1;
+    $repeatUntil = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getRepeatUntil()) : 1;
 
     $endDate = is_numeric($endDate) ? null : $endDate;
 
     $ical .=
-'BEGIN:VEVENT
-SUMMARY:' .$calendarList->getTitle(). '
-UID:' .$calendarList->getUid(). '
-DTSTART:' .date(DATE_ICAL, strtotime($calendarList->getStart())). '
-DTEND:' .date(DATE_ICAL, strtotime($calendarList->getEnd())). '
-LOCATION:' .$calendarList->getPlace(). '
-DESCRIPTION:' .$description;
-
-    if ($calendarList->getPeriodType() != '') {
-        $freq = strtoupper($calendarList->getPeriodType());
+    'BEGIN:VEVENT
+SUMMARY:' . $calendar->getTitle() . '
+UID:' . $calendar->getUid() . '
+DTSTART:' . date(DATE_ICAL, strtotime($calendar->getStart())) . '
+DTEND:' . date(DATE_ICAL, strtotime($calendar->getEnd())) . '
+LOCATION:' . $calendar->getPlace() . '
+DESCRIPTION:' . $description;
+
+    if ($calendar->getPeriodType() != '') {
+        $freq = strtoupper($calendar->getPeriodType());
         $quarterlyFactor = 1;
 
-        if ($calendarList->getPeriodType() === 'quarterly') {
+        if ($calendar->getPeriodType() === 'quarterly') {
             // 'quarterly' doesn't exist in iCal. Translate it to every 3 months.
             $freq = 'MONTHLY';
             $quarterlyFactor = 3;
@@ -49,11 +53,11 @@
         // FREQ=WEEKLY;INTERVAL=3;UNTIL=00000000T000000Z
         // Supported for FREQ: "SECONDLY" / "MINUTELY" / "HOURLY" / "DAILY" / "WEEKLY" / "MONTHLY" / "YEARLY"
         $ical .=
-"\n".'RRULE:FREQ='.strtoupper($calendarList->getPeriodType()).';INTERVAL='.($calendarList->getPeriodDay() * $quarterlyFactor).';UNTIL='.$repeatUntil->format(DATE_ICAL);
+        "\n" . 'RRULE:FREQ=' . strtoupper($calendar->getPeriodType()) . ';INTERVAL=' . ($calendar->getPeriodDay() * $quarterlyFactor) . ';UNTIL=' . $repeatUntil->format(DATE_ICAL);
     }
 
     $ical .=
-"\nEND:VEVENT\n";
+    "\nEND:VEVENT\n";
 }
 
 $ical .= 'END:VCALENDAR';
diff --git a/application/modules/calendar/views/events/index.php b/application/modules/calendar/views/events/index.php
index 190f6dba0..c334ca8a4 100644
--- a/application/modules/calendar/views/events/index.php
+++ b/application/modules/calendar/views/events/index.php
@@ -1,32 +1,36 @@
 <?php
+
+/** @var \Ilch\View $this */
+
 header('Content-Type: application/json');
 
 $events = [];
 
 // calendar entries
-foreach ($this->get('calendarList') ?? [] as $calendarList) {
+/** @var \Modules\Calendar\Models\Calendar $calendar */
+foreach ($this->get('calendarList') ?? [] as $calendar) {
     $e = [];
-    $e['title'] = $calendarList->getTitle();
-    $e['start'] = $calendarList->getStart();
-    $e['end'] = $calendarList->getEnd();
-    $e['color'] = $calendarList->getColor();
-    $e['url'] = $this->getUrl('calendar/events/show/id/' . $calendarList->getId());
+    $e['title'] = $calendar->getTitle();
+    $e['start'] = $calendar->getStart();
+    $e['end'] = $calendar->getEnd();
+    $e['color'] = $calendar->getColor();
+    $e['url'] = $this->getUrl('calendar/events/show/id/' . $calendar->getId());
 
-    $startDate = new \Ilch\Date($calendarList->getStart());
-    $endDate = $calendarList->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendarList->getEnd()) : 1;
-    $repeatUntil = $calendarList->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendarList->getRepeatUntil()) : 1;
+    $startDate = new \Ilch\Date($calendar->getStart());
+    $endDate = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getEnd()) : 1;
+    $repeatUntil = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getRepeatUntil()) : 1;
 
     // Add only or initial (in case of recurring events) event.
     $events[] = $e;
 
-    if ($calendarList->getPeriodType() != '') {
-        $recurrentEvents = $this->get('calendarMapper')->repeat($calendarList->getPeriodType(), $startDate, $endDate, $repeatUntil, $calendarList->getPeriodDay());
+    if ($calendar->getPeriodType() != '') {
+        $recurrentEvents = $this->get('calendarMapper')->repeat($calendar->getPeriodType(), $startDate, $endDate, $repeatUntil, $calendar->getPeriodDay());
         $iteration = 0;
 
-        foreach($recurrentEvents as $event) {
+        foreach ($recurrentEvents as $event) {
             $e['start'] = $event['start']->format('Y-m-d H:i:s');
             $e['end'] = $event['end']->format('Y-m-d H:i:s');
-            $e['url'] = $this->getUrl('calendar/events/show/id/' . $calendarList->getId()) . '/iteration/' . $iteration;
+            $e['url'] = $this->getUrl('calendar/events/show/id/' . $calendar->getId()) . '/iteration/' . $iteration;
             $events[] = $e;
             $iteration++;
         }
diff --git a/application/modules/calendar/views/events/show.php b/application/modules/calendar/views/events/show.php
index 85e47c789..6f8a6461c 100644
--- a/application/modules/calendar/views/events/show.php
+++ b/application/modules/calendar/views/events/show.php
@@ -1,5 +1,13 @@
 <?php
+
+/** @var \Ilch\View $this */
+
+/** @var \Modules\Calendar\Mappers\Calendar $calendarMapper */
+$calendarMapper = $this->get('calendarMapper');
+
+/** @var \Modules\Calendar\Models\Calendar $calendar */
 $calendar = $this->get('calendar');
+/** @var int $iteration */
 $iteration = $this->get('iteration');
 $periodDays = [
     '1' => $this->getTranslator()->trans('Monday'),
@@ -23,8 +31,8 @@
 $endDate = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getEnd()) : 1;
 $repeatUntil = $calendar->getEnd() != '1000-01-01 00:00:00' ? new \Ilch\Date($calendar->getRepeatUntil()) : 1;
 
-if ($this->get('iteration') != '') {
-    $recurrence = $this->get('calendarMapper')->repeat($calendar->getPeriodType(), $startDate, $endDate, $repeatUntil, $calendar->getPeriodDay())[$iteration];
+if ($iteration != '') {
+    $recurrence = $calendarMapper->repeat($calendar->getPeriodType(), $startDate, $endDate, $repeatUntil, $calendar->getPeriodDay())[$iteration];
     $startDate = $recurrence['start'];
     $endDate = $recurrence['end'];
 }
@@ -33,7 +41,7 @@
 ?>
 
 <h1><?=$this->escape($calendar->getTitle()) ?></h1>
-<?php if ($calendar->getPlace()): ?>
+<?php if ($calendar->getPlace()) : ?>
     <div class="row mb-3">
         <div class="col-xl-2"><?=$this->getTrans('place') ?></div>
         <div class="col-xl-10"><?=$this->escape($calendar->getPlace()) ?></div>
@@ -41,27 +49,27 @@
 <?php endif; ?>
 <div class="row mb-3">
     <div class="col-xl-2"><?=$this->getTrans('start') ?></div>
-    <div class="col-xl-10"><?=$this->getTrans($startDate->format('l')).$startDate->format(', d. ').$this->getTrans($startDate->format('F')).$startDate->format(' Y') ?> <?=$this->getTrans('at') ?> <?=$startDate->format('H:i') ?> <?=$this->getTrans('clock') ?></div>
+    <div class="col-xl-10"><?=$this->getTrans($startDate->format('l')) . $startDate->format(', d. ') . $this->getTrans($startDate->format('F')) . $startDate->format(' Y') ?> <?=$this->getTrans('at') ?> <?=$startDate->format('H:i') ?> <?=$this->getTrans('clock') ?></div>
 </div>
-<?php if ($endDate): ?>
+<?php if ($endDate) : ?>
     <div class="row mb-3">
         <div class="col-xl-2"><?=$this->getTrans('end') ?></div>
         <div class="col-xl-10">
-            <?=$this->getTrans($endDate->format('l')) . $endDate->format(', d. ') . $this->getTrans($endDate->format('F')) . $endDate->format(' Y') . ' ' . $this->getTrans('at').' '. $endDate->format('H:i').' '.$this->getTrans('clock') ?>
+            <?=$this->getTrans($endDate->format('l')) . $endDate->format(', d. ') . $this->getTrans($endDate->format('F')) . $endDate->format(' Y') . ' ' . $this->getTrans('at') . ' ' . $endDate->format('H:i') . ' ' . $this->getTrans('clock') ?>
         </div>
     </div>
 <?php endif; ?>
-<?php if ($calendar->getPeriodType()): ?>
+<?php if ($calendar->getPeriodType()) : ?>
     <div class="row mb-3">
         <div class="col-xl-2"><?=$this->getTrans('periodEntry') ?></div>
         <div class="col-xl-10">
             <?php
             if ($calendar->getPeriodType()) {
                 echo $periodTypes[$calendar->getPeriodType()];
-                if ($calendar->getPeriodType() != 'days'){
-                    echo ' (x '.$calendar->getPeriodDay().')';
+                if ($calendar->getPeriodType() != 'days') {
+                    echo ' (x ' . $calendar->getPeriodDay() . ')';
                 } else {
-                    echo ' ('.$periodDays[$calendar->getPeriodDay()].')';
+                    echo ' (' . $periodDays[$calendar->getPeriodDay()] . ')';
                 }
             }
             ?>
@@ -71,9 +79,9 @@
 <div class="row mb-3">
     <div class="col-xl-2"><?=$this->getTrans('description') ?></div>
     <div class="col-xl-12">
-        <?php if ($calendar->getText()): ?>
+        <?php if ($calendar->getText()) : ?>
             <?=$this->purify($calendar->getText()) ?>
-        <?php else: ?>
+        <?php else : ?>
             <?=$this->getTrans('noDescription') ?>
         <?php endif; ?>
     </div>
diff --git a/application/modules/calendar/views/index/index.php b/application/modules/calendar/views/index/index.php
index 75d75549d..974140fc7 100644
--- a/application/modules/calendar/views/index/index.php
+++ b/application/modules/calendar/views/index/index.php
@@ -1,3 +1,7 @@
+<?php
+
+/** @var \Ilch\View $this */
+?>
 <link href="<?=$this->getModuleUrl('static/css/calendar.css') ?>" rel="stylesheet">
 
 <div class="calendar">
@@ -34,7 +38,7 @@
                 icalButton: {
                     text: 'iCal',
                     click: function() {
-                        window.location = '<?=BASE_URL.'/index.php/calendar/events/iCal/' ?>';
+                        window.location = '<?=BASE_URL . '/index.php/calendar/events/iCal/' ?>';
                     }
                 }
             },
@@ -59,7 +63,9 @@
             weekNumbers: true,
             weekNumberCalculation: 'ISO',
             eventSources: [
-                <?php foreach ($this->get('events') ?? [] as $url): ?>
+                <?php
+                /** @var \Modules\Calendar\Models\Events $url */
+                foreach ($this->get('events') ?? [] as $url) : ?>
                 {
                     url: '<?=$this->getUrl($url->getUrl()) ?>'
                 },