Merge pull request #133 from kylekatarnls/fix/year-condition

Fix handling for holidays occurring only on a specific year
kylekatarnls · Oct 17, 2024 · b8efade · b8efade
2 parents ced4e2c + c007cfe
commit b8efade
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/Cmixin/BusinessDay/Calculator/HolidayCalculator.php b/src/Cmixin/BusinessDay/Calculator/HolidayCalculator.php
@@ -229,7 +229,11 @@ protected function parseHolidaysString(string $holiday): ?array
         [$holiday, $onConditions['on']] = array_pad(explode(' on ', $holiday, 2), 2, null);
         [$holiday, $condition] = array_pad(explode(' if ', $holiday, 2), 2, null);
 
-        if (strpos($holiday, "$year") === false) {
+        if (
+            !preg_match('/\d{4}-/', $holiday)
+            && !preg_match('/\/\d{4}/', $holiday)
+            && strpos($holiday, "$year") === false
+        ) {
             $holiday .= " $year";
         }
 

diff --git a/src/Cmixin/BusinessDay/Util/YearCondition.php b/src/Cmixin/BusinessDay/Util/YearCondition.php
@@ -16,16 +16,17 @@ trait YearCondition
      */
     protected function matchYearCondition($dateTime, ?string &$condition): bool
     {
+        $value = (int) $dateTime->format('Y');
+
         if (!$condition || !preg_match(
             '/^\s*year(?:\s*%\s*(?<modulo>\d+))?\s*(?<operator>>=?|<=?|={1,3}|!={1,2}|<>)\s*(?<expected>\d+)/',
             $condition,
             $match
         )) {
-            return true;
+            return $this->year === $value;
         }
 
         $condition = null;
-        $value = (int) $dateTime->format('Y');
         $expected = (int) $match['expected'];
 
         if (!empty($match['modulo'])) {

diff --git a/tests/Cmixin/Holidays/SgTest.php b/tests/Cmixin/Holidays/SgTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Cmixin\Holidays;
+
+use Cmixin\BusinessDay;
+use PHPUnit\Framework\TestCase;
+
+class SgTest extends TestCase
+{
+    const CARBON_CLASS = 'Carbon\Carbon';
+
+    protected function setUp(): void
+    {
+        BusinessDay::enable(static::CARBON_CLASS);
+        $carbon = static::CARBON_CLASS;
+        $carbon::resetHolidays();
+    }
+
+    public function testHolidays(): void
+    {
+        $carbon = static::CARBON_CLASS;
+        $carbon::resetHolidays();
+        $carbon::setHolidaysRegion('sg-national');
+
+        self::assertFalse($carbon::parse('2024-10-17')->getHolidayId());
+        self::assertSame('2028-10-17', $carbon::parse('2028-10-17')->getHolidayId());
+    }
+}