Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion src/Parser/IsoParsers.php
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public static function monthDay(): PatternParser
}

/**
* Returns a parser for a time-zone offset such as `Z` or `+01:00`.
* Returns a parser for a time-zone offset such as `Z`, `+01`, `+01:00`, `+01:00:00`.
*/
public static function timeZoneOffset(): PatternParser
{
Expand All @@ -220,8 +220,10 @@ public static function timeZoneOffset(): PatternParser
->startGroup()
->appendCapturePattern('[\-\+]', TimeZoneOffsetSign::NAME)
->appendCapturePattern(TimeZoneOffsetHour::PATTERN, TimeZoneOffsetHour::NAME)
->startOptional()
->appendLiteral(':')
->appendCapturePattern(TimeZoneOffsetMinute::PATTERN, TimeZoneOffsetMinute::NAME)
->endOptional()
->startOptional()
->appendLiteral(':')
->appendCapturePattern(TimeZoneOffsetSecond::PATTERN, TimeZoneOffsetSecond::NAME)
Expand Down
3 changes: 2 additions & 1 deletion src/TimeZoneOffset.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function from(DateTimeParseResult $result): TimeZoneOffset
}

$hour = $result->getField(Field\TimeZoneOffsetHour::NAME);
$minute = $result->getField(Field\TimeZoneOffsetMinute::NAME);
$minute = $result->getOptionalField(Field\TimeZoneOffsetMinute::NAME);
$second = $result->getOptionalField(Field\TimeZoneOffsetSecond::NAME);

$hour = (int) $hour;
Expand All @@ -128,6 +128,7 @@ public static function from(DateTimeParseResult $result): TimeZoneOffset
* The following ISO 8601 formats are accepted:
*
* * `Z` - for UTC
* * `±hh`
* * `±hh:mm`
* * `±hh:mm:ss`
*
Expand Down
8 changes: 7 additions & 1 deletion tests/TimeZoneOffsetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ public function testParse(string $text, int $totalSeconds): void
public static function providerParse(): iterable
{
yield from [
['+00', 0],
['-00', 0],
['+01', 3600],
['-01', -3600],
['+18', 64800],
['-18', -64800],

['+00:00', 0],
['-00:00', 0],
['+01:00', 3600],
Expand Down Expand Up @@ -182,7 +189,6 @@ public static function providerParseInvalidStringThrowsException(): array
return [
[''],
['00:00'],
['+00'],
['+00:'],
['+00:00:'],
['+1:00'],
Expand Down