upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #41300 from nextcloud/enh/add-timezone-generator

Browse source 
Add timezone getter to ITimeFactory
This commit is contained in:
Anna 2024-02-13 16:17:35 +01:00 committed by GitHub
commit 8822b16d37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/AppFramework/Utility/TimeFactory.php
View file

@ -73,4 +73,11 @@ class TimeFactory implements ITimeFactory {
return $clone;
}
public function getTimeZone(?string $timezone = null): \DateTimeZone {
if ($timezone !== null) {
return new \DateTimeZone($timezone);
}
return $this->timezone;
}
}

8
lib/public/AppFramework/Utility/ITimeFactory.php
View file

@ -58,4 +58,12 @@ interface ITimeFactory extends ClockInterface {
* @since 26.0.0
*/
public function withTimeZone(\DateTimeZone $timezone): static;
/**
* @param string|null $timezone
* @return \DateTimeZone Requested timezone if provided, UTC otherwise
* @throws \Exception
* @since 29.0.0
*/
public function getTimeZone(?string $timezone = null): \DateTimeZone;
}

17
tests/lib/AppFramework/Utility/TimeFactoryTest.php
View file

@ -46,4 +46,21 @@ class TimeFactoryTest extends \Test\TestCase {
$now = $withTimeZone->now();
self::assertSame('Europe/Berlin', $now->getTimezone()->getName());
}
public function testGetTimeZone(): void {
$expected = new \DateTimeZone('Europe/Berlin');
$actual = $this->timeFactory->getTimeZone('Europe/Berlin');
self::assertEquals($expected, $actual);
}
public function testGetTimeZoneUTC(): void {
$expected = new \DateTimeZone('UTC');
$actual = $this->timeFactory->getTimeZone();
self::assertEquals($expected, $actual);
}
public function testGetTimeZoneInvalid(): void {
$this->expectException(\Exception::class);
$this->timeFactory->getTimeZone('blubblub');
}
}