Restore default timezone in Calendar Extension (#30)

Author: norberttech

src/Aeon/Twig/CalendarExtension.php

@@ -22,15 +22,22 @@ final class CalendarExtension extends AbstractExtension
 {
     private Calendar $calendar;
 
+    private TimeZone $defaultTimeZone;
+
     private string $defaultDateTimeFormat;
 
     private string $defaultDayFormat;
 
     private string $defaultTimeFormat;
 
-    public function __construct(Calendar $calendar, string $defaultDateTimeFormat = 'Y-m-d H:i:s', string $defaultDayFormat = 'Y-m-d', string $defaultTimeFormat = 'H:i:s')
+    public function __construct(Calendar $calendar, string $defaultTimeZone = 'UTC', string $defaultDateTimeFormat = 'Y-m-d H:i:s', string $defaultDayFormat = 'Y-m-d', string $defaultTimeFormat = 'H:i:s')
     {
+        if (!TimeZone::isValid($defaultTimeZone)) {
+            throw new InvalidArgumentException($defaultTimeZone . ' is not valid timezone name.');
+        }
+
         $this->calendar = $calendar;
+        $this->defaultTimeZone = new TimeZone($defaultTimeZone);
         $this->defaultDateTimeFormat = $defaultDateTimeFormat;
         $this->defaultDayFormat = $defaultDayFormat;
         $this->defaultTimeFormat = $defaultTimeFormat;
@@ -85,7 +92,7 @@ public function aeon_datetime_format(DateTime $dateTime, string $format = null,
             return $dateTime->toTimeZone($tz)->format($fmt);
         }
 
-        return $dateTime->toTimeZone($this->calendar->timeZone())->format($fmt);
+        return $dateTime->toTimeZone($this->defaultTimeZone)->format($fmt);
     }
 
     public function aeon_time_format(Time $time, string $format = null) : string

tests/Aeon/Twig/Tests/Integration/CalendarExtensionTest.php

@@ -34,7 +34,7 @@ public function test_filter_aeon_datetime() : void
                 ]
             )
         );
-        $twig->addExtension(new CalendarExtension($this->calendarStub, 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
+        $twig->addExtension(new CalendarExtension($this->calendarStub, 'UTC', 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
 
         $this->assertStringEqualsFile(
             __DIR__ . '/Fixtures/filters/aeon_datetime_format.txt',
@@ -51,7 +51,7 @@ public function test_filter_aeon_day() : void
                 ]
             )
         );
-        $twig->addExtension(new CalendarExtension($this->calendarStub, 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
+        $twig->addExtension(new CalendarExtension($this->calendarStub, 'UTC', 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
 
         $this->assertStringEqualsFile(
             __DIR__ . '/Fixtures/filters/aeon_day_format.txt',
@@ -68,7 +68,7 @@ public function test_filter_aeon_time() : void
                 ]
             )
         );
-        $twig->addExtension(new CalendarExtension($this->calendarStub, 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
+        $twig->addExtension(new CalendarExtension($this->calendarStub, 'UTC', 'Y-m-d H:i:sO', 'Y-m-d', 'H:i:s'));
 
         $this->assertStringEqualsFile(
             __DIR__ . '/Fixtures/filters/aeon_time_format.txt',
@@ -119,7 +119,7 @@ public function test_function_aeon_now() : void
                 ]
             )
         );
-        $twig->addExtension(new CalendarExtension($this->calendarStub, 'Y-m-d H:i:sO', 'Y-m-d'));
+        $twig->addExtension(new CalendarExtension($this->calendarStub, 'UTC', 'Y-m-d H:i:sO', 'Y-m-d'));
 
         $this->assertStringEqualsFile(
             __DIR__ . '/Fixtures/functions/aeon_now.txt',

tests/Aeon/Twig/Tests/Unit/CalendarExtensionTest.php

@@ -16,6 +16,14 @@
 
 final class CalendarExtensionTest extends TestCase
 {
+    public function test_create_with_invalid_timezone() : void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('not_timezone is not valid timezone name.');
+
+        new CalendarExtension($calendar = new GregorianCalendarStub(), 'not_timezone');
+    }
+
     public function test_aeon_now() : void
     {
         $extension = new CalendarExtension($calendar = new GregorianCalendarStub());
@@ -29,7 +37,8 @@ public function test_aeon_now() : void
     public function test_aeon_datetime_format_takes_timezone_from_calendar_instance_when_not_provided() : void
     {
         $extension = new CalendarExtension(
-            $calendar = new GregorianCalendarStub(new \DateTimeImmutable('2020-01-01 Europe/Warsaw'))
+            $calendar = new GregorianCalendarStub(new \DateTimeImmutable('2020-01-01 UTC')),
+            'Europe/Warsaw'
         );
 
         $this->assertEquals(