Skip to content

Use the parsed offset in ZonedDateTime::parse() when a region is present #140

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

Merged
BenMorel merged 2 commits into from
Oct 10, 2026
Merged

Use the parsed offset in ZonedDateTime::parse() when a region is present #140

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
0c2630a
Use the parsed offset in ZonedDateTime::parse() when a region is present
gnutix Oct 10, 2026
84e568d
Report a local date-time in a DST gap distinctly in ZonedDateTime::pa…
gnutix Oct 10, 2026
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
33 changes: 27 additions & 6 deletions src/ZonedDateTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use function assert;
use function intdiv;
use function rtrim;
use function sprintf;
use function str_pad;

use const STR_PAD_LEFT;
Expand Down Expand Up @@ -166,14 +167,34 @@ public static function from(DateTimeParseResult $result): ZonedDateTime

if ($result->hasField(Field\TimeZoneRegion::NAME)) {
$timeZone = TimeZoneRegion::from($result);
} else {
$timeZone = $timeZoneOffset;

$zonedDateTime = ZonedDateTime::ofInstant(
ZonedDateTime::of($localDateTime, $timeZoneOffset)->getInstant(),
$timeZone,
);

if (! $zonedDateTime->getTimeZoneOffset()->isEqualTo($timeZoneOffset)) {
// In a gap, of() shifts the local date-time forward.
if (! ZonedDateTime::of($localDateTime, $timeZone)->getDateTime()->isEqualTo($localDateTime)) {
throw new DateTimeException(sprintf(
'The local date-time %s does not exist in %s.',
$localDateTime,
$timeZone,
));
}

throw new DateTimeException(sprintf(
'The offset %s is not valid for %s in %s.',
$timeZoneOffset,
$localDateTime,
$timeZone,
));
}

return $zonedDateTime;
}

return ZonedDateTime::of(
$localDateTime,
$timeZone,
);
return ZonedDateTime::of($localDateTime, $timeZoneOffset);
}

/**
Expand Down
25 changes: 24 additions & 1 deletion tests/ZonedDateTimeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,36 @@ public static function providerParse(): iterable
['2001-02-03T01:02+00:00[Europe/London]', '2001-02-03', '01:02', 'Z', 'Europe/London'],
['2001-02-03T01:02:03-00:00[Europe/London]', '2001-02-03', '01:02:03', 'Z', 'Europe/London'],
['2001-02-03T01:02:03.456+00:00[Europe/London]', '2001-02-03', '01:02:03.456', 'Z', 'Europe/London'],
['2001-07-03T01:02+01:00[Europe/London]', '2001-07-03', '01:02', '+01:00', 'Europe/London'],
['2024-10-27T02:30+02:00[Europe/Zurich]', '2024-10-27', '02:30', '+02:00', 'Europe/Zurich'],
['2024-10-27T02:30+01:00[Europe/Zurich]', '2024-10-27', '02:30', '+01:00', 'Europe/Zurich'],
];

if (PHP_VERSION_ID >= 80107) {
yield ['2001-02-03T01:02:03.456+12:34:56', '2001-02-03', '01:02:03.456', '+12:34:56', '+12:34:56'];
}
}

#[DataProvider('providerParseWithOffsetNotValidForRegionThrowsException')]
public function testParseWithOffsetNotValidForRegionThrowsException(string $text, string $expectedMessage): void
{
$this->expectException(DateTimeException::class);
$this->expectExceptionMessage($expectedMessage);

ZonedDateTime::parse($text);
}

public static function providerParseWithOffsetNotValidForRegionThrowsException(): array
{
return [
['2001-02-03T01:02+01:00[Europe/London]', 'The offset +01:00 is not valid for 2001-02-03T01:02 in Europe/London.'],
['2024-06-01T12:00Z[Europe/Zurich]', 'The offset Z is not valid for 2024-06-01T12:00 in Europe/Zurich.'],
['2024-06-01T12:00+05:00[Europe/Zurich]', 'The offset +05:00 is not valid for 2024-06-01T12:00 in Europe/Zurich.'],
['2024-03-31T02:30+01:00[Europe/Zurich]', 'The local date-time 2024-03-31T02:30 does not exist in Europe/Zurich.'],
['2024-03-31T02:30+02:00[Europe/Zurich]', 'The local date-time 2024-03-31T02:30 does not exist in Europe/Zurich.'],
];
}

#[DataProvider('providerParseInvalidStringThrowsException')]
public function testParseInvalidStringThrowsException(string $text): void
{
Expand Down Expand Up @@ -758,7 +781,7 @@ public static function providerPlusPeriod(): Generator
['2000-02-16T12:34:56.123456789-08:00[America/Los_Angeles]', Period::ofMonths(2), '2000-04-16T12:34:56.123456789-07:00[America/Los_Angeles]'],
['2000-05-16T12:34:56.123456789-07:00[America/Los_Angeles]', Period::ofMonths(-1), '2000-04-16T12:34:56.123456789-07:00[America/Los_Angeles]'],
['2000-05-16T12:34:56.123456789-07:00[America/Los_Angeles]', Period::ofMonths(-2), '2000-03-16T12:34:56.123456789-08:00[America/Los_Angeles]'],
['2000-02-16T12:34:56.123456789-07:00[America/Los_Angeles]', Period::of(1, -2, 3), '2000-12-19T12:34:56.123456789-08:00[America/Los_Angeles]'],
['2000-02-16T12:34:56.123456789-08:00[America/Los_Angeles]', Period::of(1, -2, 3), '2000-12-19T12:34:56.123456789-08:00[America/Los_Angeles]'],
];

foreach (self::providerPlusDays() as [$zonedDateTime, $plusDays, $expected]) {
Expand Down
Loading