Merge pull request #19 from ceeram/seconds

Business hours respecting seconds
florianv · Feb 12, 2016 · c48ff90 · c48ff90
2 parents 62a0e5d + 321c368
commit c48ff90
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 19 deletions.
diff --git a/src/Business.php b/src/Business.php
@@ -140,7 +140,7 @@ private function getClosestDateBefore(\DateTime $date)
 
         if (!$this->holidays->isHoliday($tmpDate) && null !== $day = $this->getDay($dayOfWeek)) {
             if (null !== $closestTime = $day->getClosestOpeningTimeBefore($time, $tmpDate)) {
-                $tmpDate->setTime($closestTime->getHours(), $closestTime->getMinutes());
+                $tmpDate->setTime($closestTime->getHours(), $closestTime->getMinutes(), $closestTime->getSeconds());
 
                 return $tmpDate;
             }
@@ -154,7 +154,7 @@ private function getClosestDateBefore(\DateTime $date)
 
         $closestDay = $this->getClosestDayBefore((int) $tmpDate->format('N'));
         $closingTime = $closestDay->getClosingTime($tmpDate);
-        $tmpDate->setTime($closingTime->getHours(), $closingTime->getMinutes());
+        $tmpDate->setTime($closingTime->getHours(), $closingTime->getMinutes(), $closingTime->getSeconds());
 
         return $tmpDate;
     }
@@ -196,7 +196,7 @@ private function getClosestDateAfter(\DateTime $date)
 
         if (!$this->holidays->isHoliday($tmpDate) && null !== $day = $this->getDay($dayOfWeek)) {
             if (null !== $closestTime = $day->getClosestOpeningTimeAfter($time, $tmpDate)) {
-                $tmpDate->setTime($closestTime->getHours(), $closestTime->getMinutes());
+                $tmpDate->setTime($closestTime->getHours(), $closestTime->getMinutes(), $closestTime->getSeconds());
 
                 return $tmpDate;
             }
@@ -210,7 +210,7 @@ private function getClosestDateAfter(\DateTime $date)
 
         $closestDay = $this->getClosestDayBefore((int) $tmpDate->format('N'));
         $closingTime = $closestDay->getOpeningTime($tmpDate);
-        $tmpDate->setTime($closingTime->getHours(), $closingTime->getMinutes());
+        $tmpDate->setTime($closingTime->getHours(), $closingTime->getMinutes(), $closingTime->getSeconds());
 
         return $tmpDate;
     }

diff --git a/src/Time.php b/src/Time.php
@@ -20,17 +20,20 @@ final class Time
 {
     private $hours;
     private $minutes;
+    private $seconds;
 
     /**
      * Creates a new time.
      *
-     * @param string $hours
-     * @param string $minutes
+     * @param string|int $hours
+     * @param string|int $minutes
+     * @param string|int $seconds Optional seconds
      */
-    public function __construct($hours, $minutes)
+    public function __construct($hours, $minutes, $seconds = 0)
     {
-        $this->hours = $hours;
-        $this->minutes = $minutes;
+        $this->hours = (int) $hours;
+        $this->minutes = (int) $minutes;
+        $this->seconds = (int) $seconds;
     }
 
     /**
@@ -62,7 +65,7 @@ public static function fromString($time)
      */
     public static function fromDate(\DateTime $date)
     {
-        return new self($date->format('H'), $date->format('i'));
+        return new self($date->format('H'), $date->format('i'), $date->format('s'));
     }
 
     /**
@@ -96,7 +99,7 @@ public function isAfterOrEqual(Time $other)
      */
     public function getHours()
     {
-        return (int) $this->hours;
+        return $this->hours;
     }
 
     /**
@@ -106,7 +109,17 @@ public function getHours()
      */
     public function getMinutes()
     {
-        return (int) $this->minutes;
+        return $this->minutes;
+    }
+
+    /**
+     * Gets the seconds.
+     *
+     * @return int
+     */
+    public function getSeconds()
+    {
+        return $this->seconds;
     }
 
     /**
@@ -116,7 +129,7 @@ public function getMinutes()
      */
     public function toInteger()
     {
-        return (int) $this->hours.$this->minutes;
+        return (int) sprintf('%d%02d%02d', $this->hours, $this->minutes, $this->seconds);
     }
 
     /**
@@ -126,6 +139,6 @@ public function toInteger()
      */
     public function toString()
     {
-        return sprintf('%s:%s', $this->hours, $this->minutes);
+        return sprintf('%02d:%02d:%02d', $this->hours, $this->minutes, $this->seconds);
     }
 }
diff --git a/tests/BusinessTest.php b/tests/BusinessTest.php
@@ -34,6 +34,7 @@ public function testWithin()
 
         $this->assertFalse($business->within(new \DateTime('2015-05-11 18:00'))); // Monday
         $this->assertFalse($business->within(new \DateTime('2015-05-12 10:00'))); // Tuesday
+        $this->assertFalse($business->within(new \DateTime('2015-05-11 13:00:25'))); // Monday, seconds outside business hours
     }
 
     public function testWithinWithHoliday()
@@ -358,6 +359,26 @@ public function testTimelineWithDaysInterval()
         $this->assertEquals('2015-06-05 10:00', $dates[3]->format('Y-m-d H:i'));
     }
 
+    public function testTimelineWithSeconds()
+    {
+        $business = new Business([
+            new Day(Days::MONDAY, [['09:00', '17:00']]),
+            new Day(Days::TUESDAY, [['09:00', '17:00']]),
+            new Day(Days::WEDNESDAY, [['09:00', '17:00']]),
+        ]);
+
+        $start = new \DateTime('2015-05-25 11:00:25'); // Monday, with seconds
+        $end = new \DateTime('2015-05-27 13:00:40');
+
+        $dates = $business->timeline($start, $end, new \DateInterval('P1D'));
+
+        $this->assertCount(3, $dates);
+
+        $this->assertEquals('2015-05-25 11:00:25', $dates[0]->format('Y-m-d H:i:s'));
+        $this->assertEquals('2015-05-26 11:00:25', $dates[1]->format('Y-m-d H:i:s'));
+        $this->assertEquals('2015-05-27 11:00:25', $dates[2]->format('Y-m-d H:i:s'));
+    }
+
     public function testTimelineWithDaysIntervalAndHolidays()
     {
         $business = new Business([

diff --git a/tests/TimeIntervalTest.php b/tests/TimeIntervalTest.php
@@ -18,7 +18,7 @@ class TimeIntervalTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The opening time "08:00" must be before the closing time "08:00".
+     * @expectedExceptionMessage The opening time "08:00:00" must be before the closing time "08:00:00".
      */
     public function testConstructorOpeningEqualClosing()
     {
@@ -27,7 +27,7 @@ public function testConstructorOpeningEqualClosing()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The opening time "18:00" must be before the closing time "08:00".
+     * @expectedExceptionMessage The opening time "18:00:00" must be before the closing time "08:00:00".
      */
     public function testConstructorOpeningAfterClosing()
     {

diff --git a/tests/TimeTest.php b/tests/TimeTest.php
@@ -41,10 +41,10 @@ public function testFromDate()
     public function testToInteger()
     {
         $time = new Time('20', '00');
-        $this->assertEquals(2000, $time->toInteger());
+        $this->assertEquals(200000, $time->toInteger());
 
         $time = new Time('09', '30');
-        $this->assertEquals(930, $time->toInteger());
+        $this->assertEquals(93000, $time->toInteger());
     }
 
     public function testIsAfterOrEqual()
@@ -66,6 +66,10 @@ public function testIsBeforeOrEqual()
     public function testToString()
     {
         $time = new Time('20', '30');
-        $this->assertEquals('20:30', $time->toString());
+        $this->assertEquals('20:30:00', $time->toString());
+        $time = new Time('9', '8', '7');
+        $this->assertEquals('09:08:07', $time->toString());
+        $time = new Time(9, 8, 7);
+        $this->assertEquals('09:08:07', $time->toString());
     }
 }