Merge pull request #6 from Lewiscowles1986/injectable-time

Added injectable time-source
Lewiscowles1986 · Dec 9, 2016 · 2d8fc25 · 2d8fc25
2 parents 87b8597 + 91dc838
commit 2d8fc25
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/ulid.php b/src/ulid.php
@@ -5,17 +5,19 @@
 final class Ulid {
     const ENCODING = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
     const ENCODING_LENGTH = 32;
+    protected $time_src;
     protected $random_float_src;
 
-    public function __construct(RandomFloatInterface $rf){
+    public function __construct(TimeSourceInterface $ts, RandomFloatInterface $rf) {
+        $this->time_src = $ts;
         $this->random_float_src = $rf;
     }
 
     public function get()
     {
         return sprintf(
             "%s%s",
-            $this->encodeTime($this->getTime(), 10),
+            $this->encodeTime($this->time_src->getTime(), 10),
             $this->encodeRandom(16)
         );
     }
@@ -49,11 +51,6 @@ private function encodeRandom(int $length) : string
         }
         return $out;
     }
-
-    private function getTime() : int
-    {
-        return time();
-    }
 }
 
 interface RandomFloatInterface {
@@ -68,3 +65,16 @@ public function generate() : float {
         return lcg_value();
     }
 }
+
+interface TimeSourceInterface {
+    public function getTime() : int;
+}
+
+class PHPTimeSource implements TimeSourceInterface {
+
+    public function __construct() { }
+
+    public function getTime() : int {
+        return time();
+    }
+}
diff --git a/tests/BaseTest.php b/tests/BaseTest.php
@@ -5,7 +5,7 @@
 
 use lewiscowles\core\Ulid;
 use lewiscowles\core\LcgRandomGenerator;
-
+use lewiscowles\core\PHPTimeSource;
 use PHPUnit\Framework\TestCase;
 
 class BaseTest extends TestCase
@@ -15,7 +15,11 @@ class BaseTest extends TestCase
 
     public function setup()
     {
-        $this->ulid = new Ulid($this->getLcgRandom());
+        $this->ulid = new Ulid($this->getTimeSource(), $this->getLcgRandom());
+    }
+
+    public function getTimeSource() {
+        return new PHPTimeSource();
     }
 
     public function getLcgRandom() {