More CalDAV empty-array time-range changes

sabre-io · Dec 2, 2021 · 3c5283b · 3c5283b
1 parent 486239b
commit 3c5283b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/lib/CalDAV/Backend/AbstractBackend.php b/lib/CalDAV/Backend/AbstractBackend.php
@@ -188,13 +188,13 @@ public function getCalendarObjectByUID($principalUri, $uid)
                         [
                             'name' => 'VEVENT',
                             'is-not-defined' => false,
-                            'time-range' => null,
+                            'time-range' => [],
                             'comp-filters' => [],
                             'prop-filters' => [
                                 [
                                     'name' => 'UID',
                                     'is-not-defined' => false,
-                                    'time-range' => null,
+                                    'time-range' => [],
                                     'text-match' => [
                                         'value' => $uid,
                                         'negate-condition' => false,

diff --git a/lib/CalDAV/ICSExportPlugin.php b/lib/CalDAV/ICSExportPlugin.php
@@ -197,7 +197,7 @@ protected function generateResponse($path, $start, $end, $expand, $componentType
                 ],
                 'prop-filters' => [],
                 'is-not-defined' => false,
-                'time-range' => null,
+                'time-range' => [],
             ]);
 
             // queryResult is just a list of base urls. We need to prefix the

diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
@@ -681,7 +681,7 @@ protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
             ],
             'prop-filters' => [],
             'is-not-defined' => false,
-            'time-range' => null,
+            'time-range' => [],
         ]);
 
         $objects = array_map(function ($url) use ($calendar) {

diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
@@ -916,7 +916,7 @@ protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateT
                 ],
                 'prop-filters' => [],
                 'is-not-defined' => false,
-                'time-range' => null,
+                'time-range' => [],
             ]);
 
             $calObjects = array_map(function ($url) use ($node) {

diff --git a/lib/CalDAV/Xml/Filter/CompFilter.php b/lib/CalDAV/Xml/Filter/CompFilter.php
@@ -53,7 +53,7 @@ public static function xmlDeserialize(Reader $reader)
             'is-not-defined' => false,
             'comp-filters' => [],
             'prop-filters' => [],
-            'time-range' => false,
+            'time-range' => [],
         ];
 
         $att = $reader->parseAttributes();

diff --git a/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php b/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php
@@ -38,7 +38,7 @@ public function testDeserialize()
             'is-not-defined' => false,
             'comp-filters' => [],
             'prop-filters' => [],
-            'time-range' => false,
+            'time-range' => [],
         ];
 
         $this->assertEquals(
@@ -130,7 +130,7 @@ public function testDeserializeComplex()
                             'is-not-defined' => true,
                             'comp-filters' => [],
                             'prop-filters' => [],
-                            'time-range' => false,
+                            'time-range' => [],
                         ],
                     ],
                     'prop-filters' => [
@@ -204,7 +204,7 @@ public function testDeserializeComplex()
                 ],
             ],
             'prop-filters' => [],
-            'time-range' => false,
+            'time-range' => [],
         ];
 
         $this->assertEquals(