Fix invalid timezone value (#180)

* Add pint for formatting

* Add tests

* Add fix

Author: marcorieser

composer.json

@@ -19,6 +19,7 @@
     },
     "require-dev": {
         "laravel/pao": "^1.1",
+        "laravel/pint": "^1.30",
         "orchestra/testbench": "^9.2 || ^10.0",
         "pestphp/pest": "^4.0",
         "spatie/laravel-ray": "^1.35",

src/Types/Event.php

@@ -11,6 +11,7 @@
 use RRule\RRuleInterface;
 use Spatie\IcalendarGenerator\Components\Event as ICalendarEvent;
 use Statamic\Entries\Entry;
+use TransformStudios\Events\Events;
 
 abstract class Event
 {
@@ -87,14 +88,14 @@ public function startTime(): string
     public function start(): CarbonImmutable
     {
         return CarbonImmutable::parse($this->start_date)
-            ->shiftTimezone($this->timezone['name'])
+            ->shiftTimezone($this->timezoneName())
             ->setTimeFromTimeString($this->startTime());
     }
 
     public function end(): CarbonImmutable
     {
         return CarbonImmutable::parse($this->start_date)
-            ->shiftTimezone($this->timezone['name'])
+            ->shiftTimezone($this->timezoneName())
             ->setTimeFromTimeString($this->endTime());
     }
 
@@ -165,14 +166,19 @@ protected function toCarbonImmutable(string|CarbonInterface $date): CarbonImmuta
     {
         $carbon = is_string($date) ? CarbonImmutable::parse($date) : $date;
 
-        return $carbon->shiftTimezone($this->timezone['name']);
+        return $carbon->shiftTimezone($this->timezoneName());
+    }
+
+    protected function timezoneName(): string
+    {
+        return Arr::get($this->timezone->data(), 'name') ?? Events::defaultTimezone();
     }
 
     private function collect(array $dates): Collection
     {
         return collect($dates)
             ->map(fn (DateTimeInterface $date) => $this->supplement(
-                date: CarbonImmutable::parse($date, $this->timezone['name'])
+                date: CarbonImmutable::parse($date, $this->timezoneName())
             ))->filter();
     }
 }

src/Types/MultiDayEvent.php

@@ -25,7 +25,7 @@ public function __construct(Entry $event, private bool $collapseMultiDays)
             ->sortBy('date')
             ->map(fn (Values $day) => new Day(
                 $day->all(),
-                $this->timezone['name'],
+                $this->timezoneName(),
                 $day->all_day || $this->isAllDay(),
             ));
     }

src/Types/RecurringEvent.php

@@ -61,7 +61,7 @@ protected function rule(bool $useEnd = false): RRuleInterface
         ];
 
         if ($end = $this->end_date) {
-            $rule['until'] = CarbonImmutable::parse($end)->shiftTimezone($this->timezone['name'])->endOfDay();
+            $rule['until'] = CarbonImmutable::parse($end)->shiftTimezone($this->timezoneName())->endOfDay();
         }
 
         if (! empty($days = $this->onSpecificDays())) {

tests/Types/MultiDayEventsTest.php

@@ -3,6 +3,7 @@
 namespace TransformStudios\Events\Tests\Types;
 
 use Carbon\Carbon;
+use Carbon\CarbonTimeZone;
 use Statamic\Facades\Entry;
 use TransformStudios\Events\EventFactory;
 use TransformStudios\Events\Types\MultiDayEvent;
@@ -117,3 +118,23 @@
 
     expect($days[0]->isAllDay())->toBeTrue();
 });
+
+test('falls back to default timezone when entry has invalid timezone value', function () {
+    $entry = Entry::make()
+        ->collection('events')
+        ->data([
+            'recurrence' => 'multi_day',
+            'days' => [
+                [
+                    'date' => '2019-11-23',
+                    'start_time' => '19:00',
+                    'end_time' => '21:00',
+                ],
+            ],
+            'timezone' => 'est',
+        ]);
+
+    $event = EventFactory::createFromEntry($entry);
+
+    expect($event->start()->timezone)->toEqual(new CarbonTimeZone('UTC'));
+});

tests/Types/RecurringEventsTest.php

@@ -9,6 +9,22 @@
 use TransformStudios\Events\Types\RecurringEvent;
 use TransformStudios\Events\Types\SingleDayEvent;
 
+test('falls back to default timezone when entry has invalid timezone value', function () {
+    $recurringEntry = Entry::make()
+        ->collection('events')
+        ->data([
+            'start_date' => Carbon::now()->toDateString(),
+            'start_time' => '11:00',
+            'recurrence' => 'daily',
+            'end_date' => Carbon::now()->addDays(2)->toDateString(),
+            'timezone' => 'est',
+        ]);
+
+    $event = EventFactory::createFromEntry($recurringEntry);
+
+    expect($event->nextOccurrences())->not->toBeEmpty();
+});
+
 test('can create recurring event', function () {
     $recurringEntry = Entry::make()
         ->collection('events')

tests/Types/SingleDayEventsTest.php

@@ -30,6 +30,22 @@
     expect($event->end()->timezone)->toEqual(new CarbonTimeZone('America/Vancouver'));
 });
 
+test('falls back to default timezone when entry has invalid timezone value', function () {
+    $entry = Entry::make()
+        ->collection('events')
+        ->data([
+            'start_date' => Carbon::now()->toDateString(),
+            'start_time' => '11:00',
+            'end_time' => '12:00',
+            'timezone' => 'est',
+        ]);
+
+    $event = EventFactory::createFromEntry($entry);
+
+    expect($event->start()->timezone)->toEqual(new CarbonTimeZone('UTC'));
+    expect($event->end()->timezone)->toEqual(new CarbonTimeZone('UTC'));
+});
+
 test('can create single all day event', function () {
     $entry = Entry::make()
         ->collection('events')