tidy

Author: edalzell

src/Tags/Events.php

@@ -42,14 +42,14 @@ public function calendar(): Collection
         $month = $this->params->get('month', now()->englishMonth);
         $year = $this->params->get('year', now()->year);
 
-        $from = parse_date($month . ' ' . $year)->startOfMonth()->startOfWeek();
-        $to = parse_date($month . ' ' . $year)->endOfMonth()->endOfWeek();
+        $from = parse_date($month.' '.$year)->startOfMonth()->startOfWeek();
+        $to = parse_date($month.' '.$year)->endOfMonth()->endOfWeek();
 
         $occurrences = $this
             ->generator()
             ->between(from: $from, to: $to)
             ->groupBy($this->spanningDays())
-            ->map(fn(EntryCollection $occurrences, string $date) => $this->day(date: $date, occurrences: $occurrences));
+            ->map(fn (EntryCollection $occurrences, string $date) => $this->day(date: $date, occurrences: $occurrences));
 
         $days = $this->output($this->makeEmptyDates(from: $from, to: $to)->merge($occurrences)->values());
 
@@ -136,22 +136,27 @@ public function upcoming(): EntryCollection|array
         return $this->output($occurrences->take($limit));
     }
 
+    private function addSpanningStartEnd(string $date, EntryCollection $occurrences): EntryCollection
+    {
+        return $occurrences->map(function (Entry $occurrence) use ($date) {
+            if (! $occurrence->spanning) {
+                return $occurrence;
+            }
+
+            $carbonDate = Carbon::parse($date)->shiftTimezone($occurrence->start->timezone);
+            $occurrence
+                ->setSupplement('spanning_start', $occurrence->start->isSameDay($carbonDate))
+                ->setSupplement('spanning_end', $occurrence->end->isSameDay($carbonDate));
+
+            return clone $occurrence;
+        });
+    }
+
     private function day(string $date, EntryCollection $occurrences): array
     {
         return [
             'date' => $date,
-            'occurrences' => $occurrences->map(function (Entry $occurrence) use ($date): Entry {
-                if (!$occurrence->spanning) {
-                    return $occurrence;
-                }
-
-                $carbonDate = Carbon::parse($date)->shiftTimezone($occurrence->start->timezone);
-                $occurrence
-                    ->setSupplement('spanning_start', $occurrence->start->isSameDay($carbonDate))
-                    ->setSupplement('spanning_end', $occurrence->end->isSameDay($carbonDate));
-
-                return clone $occurrence;
-            })->values(),
+            'occurrences' => $this->addSpanningStartEnd($date, $occurrences),
         ];
     }
 
@@ -263,7 +268,7 @@ private function spanningDays(): Closure
                 $occurrence->end->endOfDay()
             )->toArray();
 
-            return collect($spanningDays)->map(fn(CarbonImmutable $date) => $date->toDateString())->all();
+            return collect($spanningDays)->map(fn (CarbonImmutable $date) => $date->toDateString())->all();
         };
     }
 }