Skip to content

More CalDAV empty-array time-range changes #1364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

More CalDAV empty-array time-range changes #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24e467f
CalDAV/PropFilter: set empty array as default value for time-range
simonspa Oct 23, 2020
450d1e9
Adjust time-range test expectations
phil-davis Nov 16, 2021
dd19543
More CalDAV empty-array time-range changes
phil-davis Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/CalDAV/Backend/AbstractBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/ICSExportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Schedule/Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Xml/Filter/CompFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion lib/CalDAV/Xml/Filter/PropFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static function xmlDeserialize(Reader $reader)
'is-not-defined' => false,
'param-filters' => [],
'text-match' => null,
'time-range' => false,
'time-range' => [],
];

$att = $reader->parseAttributes();
Expand Down
14 changes: 7 additions & 7 deletions tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testDeserialize()
'is-not-defined' => false,
'comp-filters' => [],
'prop-filters' => [],
'time-range' => false,
'time-range' => [],
];

$this->assertEquals(
Expand Down Expand Up @@ -130,21 +130,21 @@ public function testDeserializeComplex()
'is-not-defined' => true,
'comp-filters' => [],
'prop-filters' => [],
'time-range' => false,
'time-range' => [],
],
],
'prop-filters' => [
[
'name' => 'UID',
'is-not-defined' => false,
'time-range' => false,
'time-range' => [],
'text-match' => null,
'param-filters' => [],
],
[
'name' => 'X-PROP',
'is-not-defined' => false,
'time-range' => false,
'time-range' => [],
'text-match' => null,
'param-filters' => [
[
Expand All @@ -171,7 +171,7 @@ public function testDeserializeComplex()
[
'name' => 'X-PROP2',
'is-not-defined' => true,
'time-range' => false,
'time-range' => [],
'text-match' => null,
'param-filters' => [],
],
Expand All @@ -188,7 +188,7 @@ public function testDeserializeComplex()
[
'name' => 'X-PROP4',
'is-not-defined' => false,
'time-range' => false,
'time-range' => [],
'text-match' => [
'negate-condition' => false,
'collation' => 'i;ascii-casemap',
Expand All @@ -204,7 +204,7 @@ public function testDeserializeComplex()
],
],
'prop-filters' => [],
'time-range' => false,
'time-range' => [],
];

$this->assertEquals(
Expand Down