fix errors in cal-export, re #3832

Merge request studip/studip!2696

lib/classes/calendar/ICalendarExport.class.php

@@ -124,13 +124,12 @@ class ICalendarExport
     }
 
     /**
-     * @param CalendarDate $date
+     * @param CalendarDate | CourseExDate $date
      * @return array
      */
-    public function prepareCalendarDate(CalendarDate $date): array
+    public function prepareCalendarDate($date): array
     {
-        $properties =
-            [
+        return [
             'SUMMARY'       => $date->title,
             'DESCRIPTION'   => $date->description,
             'LOCATION'      => $date->location,
@@ -152,13 +151,15 @@ class ICalendarExport
                 'month'     => $date->month
             ]
         ];
-        return $properties;
     }
 
-    public function prepareCourseDate(CourseDate $date): array
+    /**
+     * @param CalendarDate | CourseExDate $date
+     * @return array
+     */
+    public function prepareCourseDate($date): array
     {
-        $properties =
-            [
+        return [
             'SUMMARY'       => $date->course->getFullName(),
             'DESCRIPTION'   => '',
             'LOCATION'      => $date->getRoomName(),
@@ -170,7 +171,6 @@ class ICalendarExport
             'DTEND'         => $date->end_time,
             'PRIORITY'      => ''
         ];
-        return $properties;
     }
 
     /**
@@ -600,14 +600,12 @@ class ICalendarExport
      */
     private function getFacultyEmail(string $user_id): string
     {
-        $stmt = DBManager::get()->prepare('
+        return DBManager::get()->fetchColumn('
             SELECT `email`
             FROM `Institute`
             LEFT JOIN `user_inst` USING(`institut_id`)
             WHERE `Institute`.`Institut_id` = `fakultaets_id`
-              AND `user_id` = ?');
-        $stmt->execute([$user_id]);
-        return $stmt->fetchColumn();
+              AND `user_id` = ?', [$user_id]);
     }
 
     /**