refactor: change nested ifs to early return as it is best to exit early. Change to array spread instead of array_merge for simplicity.

Signed-off-by: Sacha Telgenhof <me@sachatelgenhof.com>

Author: stelgenhof

src/Yasumi/Provider/Denmark.php

@@ -58,6 +58,7 @@ public function initialize(): void
         $this->addHoliday($this->secondChristmasDay($this->year, $this->timezone, $this->locale));
         $this->calculateGreatPrayerDay();
 
+        // Add other holidays
         $this->addHoliday($this->internationalWorkersDay($this->year, $this->timezone, $this->locale, Holiday::TYPE_OBSERVANCE));
         $this->addHoliday($this->christmasEve($this->year, $this->timezone, $this->locale));
         $this->addHoliday($this->newYearsEve($this->year, $this->timezone, $this->locale, Holiday::TYPE_OBSERVANCE));
@@ -67,6 +68,7 @@ public function initialize(): void
         if ($summerTime instanceof Holiday) {
             $this->addHoliday($summerTime);
         }
+
         $winterTime = $this->winterTime($this->year, $this->timezone, $this->locale);
         if ($winterTime instanceof Holiday) {
             $this->addHoliday($winterTime);
@@ -99,14 +101,20 @@ private function calculateGreatPrayerDay(): void
     {
         $easter = $this->calculateEaster($this->year, $this->timezone)->format('Y-m-d');
 
-        if ($this->year >= 1686 && $this->year < 2024) {
-            $this->addHoliday(new Holiday(
-                'greatPrayerDay',
-                ['da' => 'store bededag'],
-                new \DateTime("fourth friday {$easter}", DateTimeZoneFactory::getDateTimeZone($this->timezone)),
-                $this->locale
-            ));
+        if ($this->year < 1686) {
+            return;
         }
+
+        if ($this->year >= 2024) {
+            return;
+        }
+
+        $this->addHoliday(new Holiday(
+            'greatPrayerDay',
+            ['da' => 'store bededag'],
+            new \DateTime("fourth friday {$easter}", DateTimeZoneFactory::getDateTimeZone($this->timezone)),
+            $this->locale
+        ));
     }
 
     /**

tests/Denmark/DaylightSavingTime.php

@@ -28,7 +28,7 @@ abstract class DaylightSavingTime extends DenmarkBaseTestCase implements Holiday
     public function __construct()
     {
         $observedYears = [1916, 1940];
-        $observedYears = array_merge($observedYears, range(1942, 1948));
+        $observedYears = [...$observedYears, ...range(1942, 1948)];
         $observedYears = array_merge($observedYears, range(1980, 2037)); // PHP caps future DST transitions
 
         $this->observedYears = $observedYears;