Skip to content

feat: preserve UTC 'Z' indicator in Period JSON serialization #765

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
bastien-roucaries wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −15
Open

feat: preserve UTC 'Z' indicator in Period JSON serialization #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cceb2f8
feat: preserve UTC 'Z' indicator in Period JSON serialization
guimard Oct 14, 2025
3ce3a83
linagora/lgs/openpaas/linagora.esn.calendar#1207: Fix PERIOD element …
renaudboyer Apr 25, 2018
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
20 changes: 12 additions & 8 deletions lib/Property/ICalendar/Period.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ function ($item) {
parent::setJsonValue($value);
}

function appendUtc($strDate) {
return strpos($strDate, 'Z') === false ? '' : 'Z';
}

/**
* Returns the value, in the format it should be encoded for json.
*
Expand All @@ -85,19 +89,19 @@ public function getJsonValue(): array
foreach ($this->getParts() as $item) {
list($start, $end) = explode('/', $item, 2);

$start = DateTimeParser::parseDateTime($start);

// This is a duration value.
if ('P' === $end[0]) {
$startDt = DateTimeParser::parseDateTime($start)->format('Y-m-d\\TH:i:s') . $this->appendUtc($start);

if ($end[0] === 'P') {
$return[] = [
$start->format('Y-m-d\\TH:i:s'),
$end,
$startDt,
$end
];
} else {
$end = DateTimeParser::parseDateTime($end);
$endDt = DateTimeParser::parseDateTime($end)->format('Y-m-d\\TH:i:s') . $this->appendUtc($end);
$return[] = [
$start->format('Y-m-d\\TH:i:s'),
$end->format('Y-m-d\\TH:i:s'),
$startDt,
$endDt
];
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/VObject/JCalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function testToJCal(): void
'sequence', new \stdClass(), 'integer', 5,
],
[
'freebusy', new \stdClass(), 'period', ['2013-05-26T21:02:13', 'PT1H'], ['2013-06-26T12:00:00', '2013-06-26T13:00:00'],
'freebusy', new \stdClass(), 'period', ['2013-05-26T21:02:13Z', 'PT1H'], ['2013-06-26T12:00:00Z', '2013-06-26T13:00:00Z'],
],
[
'url', new \stdClass(), 'uri', 'http://example.org/',
Expand Down
2 changes: 1 addition & 1 deletion tests/VObject/Parser/JsonTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public function testRoundTripJCal(): void
'sequence', new \stdClass(), 'integer', 5,
],
[
'freebusy', new \stdClass(), 'period', ['2013-05-26T21:02:13', 'PT1H'], ['2013-06-26T12:00:00', '2013-06-26T13:00:00'],
'freebusy', new \stdClass(), 'period', ['2013-05-26T21:02:13Z', 'PT1H'], ['2013-06-26T12:00:00Z', '2013-06-26T13:00:00Z'],
],
[
'url', new \stdClass(), 'uri', 'http://example.org/',
Expand Down
10 changes: 5 additions & 5 deletions tests/VObject/Parser/XmlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ public function testRFC6321Section3Part6Part9(): void
<properties>
<freebusy>
<period>
<start>2011-05-17T12:00:00</start>
<start>2011-05-17T12:00:00Z</start>
<duration>P1H</duration>
</period>
</freebusy>
Expand All @@ -693,7 +693,7 @@ public function testRFC6321Section3Part6Part9(): void
</icalendar>
XML,
'BEGIN:VCALENDAR'."\n".
'FREEBUSY:20110517T120000/P1H'."\n".
'FREEBUSY:20110517T120000Z/P1H'."\n".
'END:VCALENDAR'."\n"
);

Expand All @@ -705,16 +705,16 @@ public function testRFC6321Section3Part6Part9(): void
<properties>
<freebusy>
<period>
<start>2011-05-17T12:00:00</start>
<end>2012-05-17T12:00:00</end>
<start>2011-05-17T12:00:00Z</start>
<end>2012-05-17T12:00:00Z</end>
</period>
</freebusy>
</properties>
</vcalendar>
</icalendar>
XML,
'BEGIN:VCALENDAR'."\n".
'FREEBUSY:20110517T120000/20120517T120000'."\n".
'FREEBUSY:20110517T120000Z/20120517T120000Z'."\n".
'END:VCALENDAR'."\n"
);
}
Expand Down
Loading