added more fixes for timer: need to finish two more tests

Author: maschmann

src/Asm/Config/ConfigTimer.php

@@ -50,7 +50,6 @@ public function setConfig($file)
                         foreach ($params as $paramKey => $paramVal) {
                             switch ($paramKey) {
                                 case 'interval':
-
                                     // check the contents of interval
                                     foreach ($paramVal as $intervalKey => $interval) {
 

src/Asm/Test/TestData.php

@@ -64,27 +64,32 @@ public static function getYamlTimerConfigFile()
 
     example_timer_config_4:
         day:                [ monday ]                  # works only mondays
-        time:               [ "01:05:00", "17:00:00" ]  # from 01:05:00 to 17:00:00
+        time:
+            - [ "01:05:00", "17:00:00" ]  # from 01:05:00 to 17:00:00
 
     example_timer_config_5:
-        time:               [ "01:05:00", "17:00:00" ]  # from 01:05:00 to 17:00:00
+        time:
+            - [ "01:05:00", "17:00:00" ]  # from 01:05:00 to 17:00:00
 
     example_timer_config_6:
         holiday:
-            use_gerneral:   true                        # if false, uses holidays conf for shops
+            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
+            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:
         day:                [ sunday ] # works only sundays
-        time:               [ "00:00:01", "16:00:00" ]  # from 00:00:01 to 16:00:00
+        time:
+            - [ "00:00:01", "16:00:00" ]  # from 00:00:01 to 16:00:00
 
 
 

src/Asm/Tests/Timer/TimerTest.php

@@ -36,11 +36,43 @@ public function testConstruct()
         );
 
         $this->assertInstanceOf('Asm\Config\ConfigTimer', $config);
-
         $timer = new Timer($config);
-
         $this->assertInstanceOf('Asm\Timer\Timer', $timer);
 
         return $timer;
     }
+
+    /**
+     * @depends testConstruct
+     * @covers \Asm\Timer\Timer::isTimerActive
+     * @covers \Asm\Timer\Timer::checkDate
+     * @covers \Asm\Timer\Timer::checkIntervals
+     * @covers \Asm\Timer\Timer::checkDays
+     * @covers \Asm\Timer\Timer::checkTime
+     * @covers \Asm\Timer\Timer::checkHoliday
+     * @param Timer $timer
+     */
+    public function testIsTimerActive(Timer $timer)
+    {
+        $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_1')));
+        $this->assertTrue(is_bool($timer->isTimerActive('example_timer_config_2')));
+        $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')));
+    }
+
+    /**
+     * @depends testConstruct
+     * @covers \Asm\Timer\Timer::isHoliday
+     * @covers \Asm\Timer\Timer::checkHoliday
+     * @param 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()));
+    }
 }

src/Asm/Timer/Timer.php

@@ -64,7 +64,9 @@ public function isTimerActive($type)
         // pre-check holidays
         if (isset($this->currentConf['holiday'])) {
             // check if general holidays are to be used
-            if (true === $this->currentConf['holiday']['use_general']) {
+            if (isset($this->currentConf['holiday']['use_general'])
+                && true === (bool)$this->currentConf['holiday']['use_general']
+            ) {
                 if (false == $this->isHoliday()) {
                     $return = $this->checkDate();
                 }
@@ -84,7 +86,7 @@ public function isTimerActive($type)
     /**
      * calculate difference between holiday DateTime objects and current or given time
      *
-     * @param  mixed $date
+     * @param  string|null $date
      * @return bool|\DateTime
      */
     public function isHoliday($date = null)
@@ -95,6 +97,7 @@ public function isHoliday($date = null)
     /**
      * returns holiday object, if set
      *
+     * @codeCoverageIgnore
      * @return \DateTime|null
      */
     public function getHoliday()
@@ -137,7 +140,7 @@ private function checkDate()
     /**
      * check for holidays
      *
-     * @param  \DateTime|null $date
+     * @param  string|null $date
      * @return bool
      */
     private function checkHoliday($date = null)
@@ -220,6 +223,10 @@ 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]);
@@ -255,31 +262,36 @@ private function checkDays()
     /**
      * do time comparison
      *
+     * @param array $intervals
      * @return bool
      */
-    private function checkTime()
+    private function checkTime($intervals = array())
     {
-        $intervals = array();
+        $return = array();
+        if (empty($intervals)) {
+            $intervals = $this->currentConf['time'];
+        }
 
-        foreach ($this->currentConf['time'] as $intKey => $arrTime) {
+        foreach ($intervals as $intKey => $intervalParts) {
             // build objects for comparison
-            $objStartTime = new \DateTime();
-            $startTime = explode(':', $arrTime[0]);
-            $intervals[$intKey][0] = $objStartTime->setTime(
-                $startTime[0],
-                $startTime[1],
-                $startTime[2]
+            $startTime = new \DateTime();
+            $startTimeParts = explode(':', $intervalParts[0]);
+
+            $return[$intKey][0] = $startTime->setTime(
+                $startTimeParts[0],
+                $startTimeParts[1],
+                $startTimeParts[2]
             );
 
-            $objEndTime = new \DateTime();
-            $endTime = explode(':', $arrTime[1]);
-            $intervals[$intKey][1] = $objEndTime->setTime(
-                $endTime[0],
-                $endTime[1],
-                $endTime[2]
+            $endTime = new \DateTime();
+            $endTimeParts = explode(':', $intervalParts[1]);
+            $return[$intKey][1] = $endTime->setTime(
+                $endTimeParts[0],
+                $endTimeParts[1],
+                $endTimeParts[2]
             );
         }
 
-        return $this->checkIntervals($intervals);
+        return $this->checkIntervals($return);
     }
 }