fix export of course dates, fixes #4626

Closes #4626

Merge request studip/studip!3438

3 files changed, 22 insertions, 24 deletions

diff --git a/lib/classes/CourseDateList.php b/lib/classes/CourseDateList.php
index 881d6da..5f6d4b1 100644
--- a/lib/classes/CourseDateList.php
+++ b/lib/classes/CourseDateList.php
@@ -138,40 +138,38 @@ class CourseDateList implements Stringable
         return $this->regular_dates;
     }
 
+    /**
+     * @param bool $include_regular_dates
+     * @param bool $include_cancelled_dates
+     * @param bool $sorted
+     * @return CourseDate[]|CourseExDate[]
+     */
     public function getSingleDates(
         bool $include_regular_dates = false,
         bool $include_cancelled_dates = false,
         bool $sorted = false
     ): array {
+        $all_single_dates = [];
+
         if ($include_regular_dates) {
-            $all_single_dates = [];
             foreach ($this->regular_dates as $regular_date) {
                 foreach ($regular_date->dates as $date) {
                     $all_single_dates[] = $date;
                 }
             }
-            $all_single_dates = array_merge($all_single_dates, $this->single_dates);
-            if ($include_cancelled_dates) {
-                $all_single_dates = array_merge($all_single_dates, $this->cancelled_dates);
-            }
-            if ($sorted) {
-                uasort($all_single_dates, self::compareSingleDatesOrCancelledDates(...));
-            }
-            return $all_single_dates;
-        } else {
-            if ($include_cancelled_dates || $sorted) {
-                $all_single_dates = $this->single_dates;
-                if ($include_cancelled_dates) {
-                    $all_single_dates = array_merge($all_single_dates, $this->cancelled_dates);
-                }
-                if ($sorted) {
-                    uasort($all_single_dates, self::compareSingleDatesOrCancelledDates(...));
-                }
-                return $all_single_dates;
-            } else {
-                return $this->single_dates;
-            }
         }
+
+        $all_single_dates = array_merge($all_single_dates, $this->single_dates);
+
+        if ($include_cancelled_dates) {
+            $all_single_dates = array_merge($all_single_dates, $this->cancelled_dates);
+        }
+
+        if ($sorted) {
+            uasort($all_single_dates, self::compareSingleDatesOrCancelledDates(...));
+        }
+
+        return $all_single_dates;
     }
 
     public function getCancelledDates() : array
diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
index 943bf23..46610d5 100644
--- a/lib/models/CourseDate.php
+++ b/lib/models/CourseDate.php
@@ -235,7 +235,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
     /**
      * Returns the assigned room for this date as an object.
      *
-     * @return Room Either the object or null if no room is assigned
+     * @return Resource Either the object or null if no room is assigned
      */
     public function getRoom()
     {
diff --git a/lib/models/resources/Resource.php b/lib/models/resources/Resource.php
index e1d8b67..4dae189 100644
--- a/lib/models/resources/Resource.php
+++ b/lib/models/resources/Resource.php
@@ -2817,7 +2817,7 @@ class Resource extends SimpleORMap implements StudipItem
     /**
      * Converts a Resource object to an object of a specialised resource class.
      *
-     * @return Resource|other An object of a specialised resource class
+     * @return Resource An object of a specialised resource class
      *     or a Resource object, if the resource is a standard resource
      *     with the class_name 'Resource' in its resource category.
      *     If the derived resource class is not available, an instance of