Add function param/return types, fix a lot more phpstorm complaints

2 files changed, 8 insertions, 3 deletions

diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
index f03444c2..786ab459 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_davinci.inc.php
@@ -68,7 +68,7 @@ class CourseBackend_Davinci extends CourseBackend
 	 * @param string $roomId unique name of the room, as used by davinci
 	 * @param \DateTime $startDate start date to fetch
 	 * @param \DateTime $endDate end date of range to fetch
-	 * @return array|bool if successful the array representation of the timetable
+	 * @return false|string if successful the array representation of the timetable
 	 */
 	private function fetchRoomRaw(string $roomId, DateTime $startDate, DateTime $endDate)
 	{
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
index 5920231f..df33dadd 100755
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_exchange.inc.php
@@ -173,8 +173,13 @@ class CourseBackend_Exchange extends CourseBackend
 
 			// Iterate over the events that were found, printing some data for each.
 			foreach ($items as $item) {
-				$start = new DateTime($item->Start);
-				$end = new DateTime($item->End);
+				try {
+					$start = new DateTime($item->Start);
+					$end = new DateTime($item->End);
+				} catch (Exception $e) {
+					$this->addError("Invalid date range: '{$item->Start}' -> '{$item->End}'", false);
+					continue;
+				}
 
 				$schedules[$roomId][] = array(
 					'title' => $item->Subject,