fixed timer to pass all test cases

Author: maschmann

src/Asm/Config/ConfigTimer.php

@@ -89,7 +89,7 @@ public function setConfig($file)
                     foreach ($timers as $timerSubKey => $params) {
 
                         foreach ($params as $paramKey => $paramValue) {
-                            $config[$timerKey][$timerSubKey][$paramKey] = array(
+                            $config[$timerKey][$timerSubKey] = array(
                                 new \DateTime($paramValue),
                                 new \DateTime($paramValue . ' 23:59:59'),
                             );

src/Asm/Test/TestData.php

@@ -75,15 +75,20 @@ public static function getYamlTimerConfigFile()
         holiday:
             use_gerneral:   true                        # if false, uses separate holidays conf
             additional:     [ sub, 1 ]                  # add or subract n days to holiday to create range
-            interval:
-                - [ "16:00:00", "16:00:00" ]  # start and end time
+
+    example_timer_config_7:
+        holiday:
+            use_gerneral:   true                        # if false, uses separate holidays conf
+            additional:     [ sub, 1 ]                  # add or subract n days to holiday to create range
+        interval:
+            - [ "16:00:00", "16:00:00" ]  # start and end time
 
     general_shipping_promise:
         holiday:
             use_general:    true
             additional:     [ sub, 1 ]                  # add or subract n days to holiday to create range
-            interval:
-                - [ "16:00:00", "16:00:00" ]  # start and end time
+        interval:
+            - [ "16:00:00", "16:00:00" ]  # start and end time
         day:                [ monday, tuesday, wednesday, thursday, friday, sunday  ]
 
     shipping_promise_sunday:

src/Asm/Tests/Timer/TimerTest.php

@@ -50,6 +50,7 @@ public function testConstruct()
      * @covers \Asm\Timer\Timer::checkDays
      * @covers \Asm\Timer\Timer::checkTime
      * @covers \Asm\Timer\Timer::checkHoliday
+     * @covers \Asm\Timer\Timer::flush
      * @param Timer $timer
      */
     public function testIsTimerActive(Timer $timer)
@@ -59,8 +60,9 @@ public function testIsTimerActive(Timer $timer)
         $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_3')));
         $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_4')));
         $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_5')));
-        //$this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_6')));
-        //$this->assertTrue(is_bool($timer->isTimerActive('general_shipping_promise')));
+        $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_6')));
+        $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_7')));
+        $this->assertTrue(is_bool($timer->isTimerActive('general_shipping_promise')));
     }
 
     /**
@@ -71,8 +73,8 @@ public function testIsTimerActive(Timer $timer)
      */
     public function testIsHoliday(Timer $timer)
     {
-        $this->assertFalse($timer->isHoliday('2014-03-03 00:00:00'));
-        $this->assertTrue($timer->isHoliday('2014-12-24 12:30:01'));
-        $this->assertTrue(is_bool($timer->isHoliday()));
+        $this->assertFalse($timer->isHoliday('2014-03-03 00:00:00'), 'failed to check non-holiday date');
+        $this->assertTrue($timer->isHoliday('2014-12-24 12:30:01'), 'failed to validate christmas');
+        $this->assertTrue(is_bool($timer->isHoliday()), 'failed to validate bool return');
     }
 }

src/Asm/Timer/Timer.php

@@ -80,6 +80,7 @@ public function isTimerActive($type)
             $return = $this->checkDate();
         }
 
+        $this->flush();
         return $return;
     }
 
@@ -105,6 +106,15 @@ public function getHoliday()
         return $this->holiday;
     }
 
+    /**
+     * clear current configuration
+     */
+    public function flush()
+    {
+        $this->currentConf = array();
+        $this->holiday = null;
+    }
+
     /**
      * date checks on config
      *
@@ -223,11 +233,6 @@ private function checkIntervals(array $intervals = array())
         }
 
         foreach ($intervals as $interval) {
-            // this means: just some time
-            if (!is_a($interval[0], 'DateTime') || !is_a($interval[1], 'DateTime')) {
-                $interval = $this->checkTime($intervals);
-            }
-
             $intervalStart = $today->diff($interval[0]);
             $intervalEnd = $today->diff($interval[1]);