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: 2 additions & 2 deletions src/Components/TimezoneEntry.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public static function createFromTransition(TimezoneTransition $transition): sel
return new self(
$transition->type,
$transition->start,
$transition->offsetFrom->format('%R%H%M'),
$transition->offsetTo->format('%R%H%M')
$transition->offsetFrom->format('%R%H%I'),
$transition->offsetTo->format('%R%H%I')
);
}

Expand Down
73 changes: 72 additions & 1 deletion tests/Components/TimezoneEntryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
use Spatie\IcalendarGenerator\Enums\RecurrenceFrequency;
use Spatie\IcalendarGenerator\Enums\TimezoneEntryType;
use Spatie\IcalendarGenerator\Tests\PayloadExpectation;
use Spatie\IcalendarGenerator\Timezones\TimezoneTransition;
use Spatie\IcalendarGenerator\Timezones\TimezoneTransitionsResolver;
use Spatie\IcalendarGenerator\ValueObjects\RRule;

use function Spatie\Snapshots\assertMatchesSnapshot;

test('it can create a standard entry', function () {
Expand Down Expand Up @@ -100,3 +101,73 @@

assertMatchesSnapshot($written);
});

test('it correctly formats half-hour offsets when created from transition', function () {
$positiveOffsetFrom = new DateInterval('PT9H30M');
$positiveOffsetFrom->invert = 0;

$positiveOffsetTo = new DateInterval('PT10H30M');
$positiveOffsetTo->invert = 0;

$positiveTransition = new TimezoneTransition(
new DateTime('2025-10-05 02:00:00'),
$positiveOffsetFrom,
$positiveOffsetTo,
TimezoneEntryType::Daylight
);

$positiveEntry = TimezoneEntry::createFromTransition($positiveTransition);
$positivePayload = $positiveEntry->resolvePayload();

PayloadExpectation::create($positivePayload)
->expectType('DAYLIGHT')
->expectPropertyValue('TZOFFSETFROM', '+0930')
->expectPropertyValue('TZOFFSETTO', '+1030');

$negativeOffsetFrom = new DateInterval('PT3H30M');
$negativeOffsetFrom->invert = 1;

$negativeOffsetTo = new DateInterval('PT4H30M');
$negativeOffsetTo->invert = 1;

$negativeTransition = new TimezoneTransition(
new DateTime('2025-04-06 03:00:00'),
$negativeOffsetFrom,
$negativeOffsetTo,
TimezoneEntryType::Standard
);

$negativeEntry = TimezoneEntry::createFromTransition($negativeTransition);
$negativePayload = $negativeEntry->resolvePayload();

PayloadExpectation::create($negativePayload)
->expectType('STANDARD')
->expectPropertyValue('TZOFFSETFROM', '-0330')
->expectPropertyValue('TZOFFSETTO', '-0430');
});

test('it correctly handles Australia Adelaide timezone with half-hour offsets', function () {
$resolver = new TimezoneTransitionsResolver(
new DateTimeZone('Australia/Adelaide'),
new DateTime('2025-08-01 00:00:00'),
new DateTime('2025-08-31 23:59:59')
);

$transitions = $resolver->getTransitions();

$standardEntry = TimezoneEntry::createFromTransition($transitions[0]);
$standardPayload = $standardEntry->resolvePayload();

PayloadExpectation::create($standardPayload)
->expectType('STANDARD')
->expectPropertyValue('TZOFFSETFROM', '+1030')
->expectPropertyValue('TZOFFSETTO', '+0930');

$daylightEntry = TimezoneEntry::createFromTransition($transitions[1]);
$daylightPayload = $daylightEntry->resolvePayload();

PayloadExpectation::create($daylightPayload)
->expectType('DAYLIGHT')
->expectPropertyValue('TZOFFSETFROM', '+0930')
->expectPropertyValue('TZOFFSETTO', '+1030');
});
Loading