Merge pull request #16 from bendavies/holidays-public

fix addHoliday, make addHoliday and addHolidays public
florianv · Sep 18, 2015 · 62a0e5d · 62a0e5d
2 parents fca0c6b + 540dc66
commit 62a0e5d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/Holidays.php b/src/Holidays.php
@@ -67,17 +67,17 @@ public function unserialize($serialized)
      *
      * @param \DateTime $holiday
      */
-    private function addHoliday(\DateTime $holiday)
+    public function addHoliday(\DateTime $holiday)
     {
-        $this->holidays[$holiday->format('Y-m-d')] = $holiday;
+        $this->holidays->attach($holiday);
     }
 
     /**
      * Adds a set of days.
      *
      * @param \DateTime[]|DateRange[]|DateRange $holidays
      */
-    private function addHolidays($holidays)
+    public function addHolidays($holidays)
     {
         foreach ($holidays as $holiday) {
             if ($holiday instanceof DateRange) {
@@ -86,7 +86,7 @@ private function addHolidays($holidays)
                 continue;
             }
 
-            $this->holidays->attach($holiday);
+            $this->addHoliday($holiday);
         }
     }
 }
diff --git a/tests/HolidaysTest.php b/tests/HolidaysTest.php
@@ -27,6 +27,29 @@ public function testIsHoliday()
         $this->assertTrue($holidays->isHoliday(new \DateTime('2015-07-09 10:00')));
     }
 
+    public function testAddHoliday()
+    {
+        $holiday = new \DateTime('2015-05-11');
+
+        $holidays = new Holidays();
+        $holidays->addHoliday($holiday);
+
+        $this->assertTrue($holidays->isHoliday($holiday));
+    }
+
+    public function testAddHolidays()
+    {
+        $holiday = new \DateTime('2015-05-11');
+        $holidayRange = new DateRange(new \DateTime('2015-07-08'), new \DateTime('2015-07-21'));
+
+        $holidays = new Holidays();
+        $holidays->addHolidays([$holiday]);
+        $holidays->addHolidays($holidayRange);
+
+        $this->assertTrue($holidays->isHoliday($holiday));
+        $this->assertTrue($holidays->isHoliday(new \DateTime('2015-07-09 10:00')));
+    }
+
     public function testSerializeUnserialize()
     {
         $holidays = new Holidays([