Merge pull request #20102 from nextcloud/backport/18679/stable18

[stable18] fix OCA\DAV\CalDAV\CalDavBackend search $options

Author: MorrisJobke

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -33,6 +33,7 @@
 
 namespace OCA\DAV\CalDAV;
 
+use DateTime;
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\DAV\Sharing\Backend;
 use OCA\DAV\DAV\Sharing\IShareable;
@@ -1551,14 +1552,14 @@ public function search(array $calendarInfo, $pattern, array $searchProperties,
 			->from('calendarobjects', 'c');
 
 		if (isset($options['timerange'])) {
-			if (isset($options['timerange']['start'])) {
+			if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTime) {
 				$outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp)));
+					$outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp())));
 
 			}
-			if (isset($options['timerange']['end'])) {
+			if (isset($options['timerange']['end']) && $options['timerange']['end'] instanceof DateTime) {
 				$outerQuery->andWhere($outerQuery->expr()->lt('firstoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp)));
+					$outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp())));
 			}
 		}
 
@@ -2258,7 +2259,7 @@ public function getDenormalizedData($calendarData) {
 				}
 			} else {
 				$it = new EventIterator($vObject, (string)$component->UID);
-				$maxDate = new \DateTime(self::MAX_DATE);
+				$maxDate = new DateTime(self::MAX_DATE);
 				if ($it->isInfinite()) {
 					$lastOccurrence = $maxDate->getTimestamp();
 				} else {

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

@@ -807,7 +807,7 @@ public function testCalendarSearch() {
 	/**
 	 * @dataProvider searchDataProvider
 	 */
-	public function testSearch($isShared, $count) {
+	public function testSearch(bool $isShared, array $searchOptions, int $count) {
 		$calendarId = $this->createTestCalendar();
 
 		$uris = [];
@@ -901,15 +901,16 @@ public function testSearch($isShared, $count) {
 		];
 
 		$result = $this->backend->search($calendarInfo, 'Test',
-			['SUMMARY', 'LOCATION', 'ATTENDEE'], [], null, null);
+			['SUMMARY', 'LOCATION', 'ATTENDEE'], $searchOptions, null, null);
 
 		$this->assertCount($count, $result);
 	}
 
 	public function searchDataProvider() {
 		return [
-			[false, 4],
-			[true, 2],
+			[false, [], 4],
+			[true, ['timerange' => ['start' => new DateTime('2013-09-12 13:00:00'), 'end' => new DateTime('2013-09-12 14:00:00')]], 2],
+			[true, ['timerange' => ['start' => new DateTime('2013-09-12 15:00:00'), 'end' => new DateTime('2013-09-12 16:00:00')]], 0],
 		];
 	}