Skip to content

Commit 3c5283b

Browse files
committed
More CalDAV empty-array time-range changes
1 parent 486239b commit 3c5283b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

lib/CalDAV/Backend/AbstractBackend.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ public function getCalendarObjectByUID($principalUri, $uid)
188188
[
189189
'name' => 'VEVENT',
190190
'is-not-defined' => false,
191-
'time-range' => null,
191+
'time-range' => [],
192192
'comp-filters' => [],
193193
'prop-filters' => [
194194
[
195195
'name' => 'UID',
196196
'is-not-defined' => false,
197-
'time-range' => null,
197+
'time-range' => [],
198198
'text-match' => [
199199
'value' => $uid,
200200
'negate-condition' => false,

lib/CalDAV/ICSExportPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ protected function generateResponse($path, $start, $end, $expand, $componentType
197197
],
198198
'prop-filters' => [],
199199
'is-not-defined' => false,
200-
'time-range' => null,
200+
'time-range' => [],
201201
]);
202202

203203
// queryResult is just a list of base urls. We need to prefix the

lib/CalDAV/Plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
681681
],
682682
'prop-filters' => [],
683683
'is-not-defined' => false,
684-
'time-range' => null,
684+
'time-range' => [],
685685
]);
686686

687687
$objects = array_map(function ($url) use ($calendar) {

lib/CalDAV/Schedule/Plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateT
916916
],
917917
'prop-filters' => [],
918918
'is-not-defined' => false,
919-
'time-range' => null,
919+
'time-range' => [],
920920
]);
921921

922922
$calObjects = array_map(function ($url) use ($node) {

lib/CalDAV/Xml/Filter/CompFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static function xmlDeserialize(Reader $reader)
5353
'is-not-defined' => false,
5454
'comp-filters' => [],
5555
'prop-filters' => [],
56-
'time-range' => false,
56+
'time-range' => [],
5757
];
5858

5959
$att = $reader->parseAttributes();

tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testDeserialize()
3838
'is-not-defined' => false,
3939
'comp-filters' => [],
4040
'prop-filters' => [],
41-
'time-range' => false,
41+
'time-range' => [],
4242
];
4343

4444
$this->assertEquals(
@@ -130,7 +130,7 @@ public function testDeserializeComplex()
130130
'is-not-defined' => true,
131131
'comp-filters' => [],
132132
'prop-filters' => [],
133-
'time-range' => false,
133+
'time-range' => [],
134134
],
135135
],
136136
'prop-filters' => [
@@ -204,7 +204,7 @@ public function testDeserializeComplex()
204204
],
205205
],
206206
'prop-filters' => [],
207-
'time-range' => false,
207+
'time-range' => [],
208208
];
209209

210210
$this->assertEquals(

0 commit comments

Comments
 (0)