Skip to content

Commit d098709

Browse files
committed
Update default timezone to Etc/UTC and adjust related configurations
1 parent 38c88b2 commit d098709

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/EventListener/TimezoneListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function __construct(
1818
private TimezoneManager $timezoneManager,
1919
private RequestStack $requestStack,
2020
private ?RequestContextAwareInterface $router = null,
21-
private string $defaultTimezone = 'UTC',
21+
private string $defaultTimezone = 'Etc/UTC',
2222
)
2323
{
2424
}
@@ -60,7 +60,7 @@ private function setTimezone(Request $request): void
6060

6161
private function setRouterContext(Request $request): void
6262
{
63-
$this->router?->getContext()->setParameter('_timezone', $request->headers->get('X-Timezone') ?? $this->defaultTimezone);
63+
$this->router?->getContext()->setParameter('_timezone', $this->timezoneManager->getTimezone());
6464
}
6565

6666
public static function getSubscribedEvents(): array

src/Manager/TimezoneManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public function __construct(
2020
)
2121
{
2222
if (empty($this->enabledTimezoneNames)) {
23-
$this->enabledTimezoneNames = ['UTC', ...Timezones::getIds()];
23+
$this->enabledTimezoneNames = Timezones::getIds();
2424
}
2525

26-
$this->timezone = new DateTimeZone('UTC');
26+
$this->timezone = new DateTimeZone('Etc/UTC');
2727

2828
self::setInstance($this);
2929
}

src/SoureCodeTimezoneBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ class SoureCodeTimezoneBundle extends AbstractBundle
1818

1919
public function configure(DefinitionConfigurator $definition): void
2020
{
21-
$timezones = ['UTC', ...Timezones::getIds()];
21+
$timezones = Timezones::getIds();
2222

2323
// @formatter:off
2424
$definition->rootNode()
2525
->fixXmlConfig('timezone')
2626
->children()
2727
->scalarNode('default_timezone')
28-
->defaultValue('UTC')
28+
->defaultValue('Etc/UTC')
2929
->info('The default timezone.')
3030
->validate()
3131
->ifTrue(fn ($v) => !in_array($v, $timezones, true))

tests/Manager/TimezoneManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testDefaultTimezoneIsSetOnInitialization(): void
4343
$timezone = $timezoneManager->getTimezone();
4444

4545
// Assert
46-
$this->assertEquals('UTC', $timezone->getName());
46+
$this->assertEquals('Etc/UTC', $timezone->getName());
4747
}
4848

4949
public function testSetValidTimezone(): void

tests/app/config/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717

1818
soure_code_timezone:
1919
default_timezone: 'Asia/Tokyo'
20-
enabled_timezones: ['UTC', 'Europe/Berlin', 'Asia/Tokyo', 'Australia/Sydney']
20+
enabled_timezones: ['Etc/UTC', 'Europe/Berlin', 'Asia/Tokyo', 'Australia/Sydney']
2121

2222
framework:
2323
session:

0 commit comments

Comments
 (0)