Dont force leading zeros and allow for integer|string type arguments …

…in Time class

src/Time.php

@@ -25,15 +25,15 @@ final class Time
     /**
      * Creates a new time.
      *
-     * @param string $hours
-     * @param string $minutes
-     * @param string $seconds Optional seconds with leading zero
+     * @param string|int $hours
+     * @param string|int $minutes
+     * @param string|int $seconds Optional seconds
      */
-    public function __construct($hours, $minutes, $seconds = '00')
+    public function __construct($hours, $minutes, $seconds = 0)
     {
-        $this->hours = $hours;
-        $this->minutes = $minutes;
-        $this->seconds = $seconds;
+        $this->hours = (int) $hours;
+        $this->minutes = (int) $minutes;
+        $this->seconds = (int) $seconds;
     }
 
     /**
@@ -99,7 +99,7 @@ public function isAfterOrEqual(Time $other)
      */
     public function getHours()
     {
-        return (int) $this->hours;
+        return $this->hours;
     }
 
     /**
@@ -109,7 +109,7 @@ public function getHours()
      */
     public function getMinutes()
     {
-        return (int) $this->minutes;
+        return $this->minutes;
     }
 
     /**
@@ -119,7 +119,7 @@ public function getMinutes()
      */
     public function getSeconds()
     {
-        return (int) $this->seconds;
+        return $this->seconds;
     }
 
     /**
@@ -129,7 +129,7 @@ public function getSeconds()
      */
     public function toInteger()
     {
-        return (int) $this->hours.$this->minutes.$this->seconds;
+        return (int) sprintf('%d%02d%02d', $this->hours, $this->minutes, $this->seconds);
     }
 
     /**
@@ -139,6 +139,6 @@ public function toInteger()
      */
     public function toString()
     {
-        return sprintf('%s:%s:%s', $this->hours, $this->minutes, $this->seconds);
+        return sprintf('%02d:%02d:%02d', $this->hours, $this->minutes, $this->seconds);
     }
 }

tests/TimeTest.php

@@ -67,5 +67,9 @@ public function testToString()
     {
         $time = new Time('20', '30');
         $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());
     }
 }