Separate classes/interfaces. This should fix #7

Author: garak

composer.json

@@ -7,7 +7,10 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "phpunit/phpunit": "^5.4"
+        "phpunit/phpunit": "^6.0"
+    },
+    "autoload": {
+        "psr-4": { "lewiscowles\\core\\": "src" }
     },
     "license": "AGPL-3.0",
     "authors": [

phpunit.xml.dist

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="true">
+<phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Lewiscowles1986/ulid">
-            <directory suffix="Test.php">./tests/</directory>
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>

src/LcgRandomGenerator.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace lewiscowles\core;
+
+class LcgRandomGenerator implements RandomFloatInterface
+{
+    public function generate(): float
+    {
+        return lcg_value();
+    }
+}

src/PHPTimeSource.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace lewiscowles\core;
+
+class PHPTimeSource implements TimeSourceInterface
+{
+    public function getTime(): int
+    {
+        return time();
+    }
+}

src/RandomFloatInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace lewiscowles\core;
+
+interface RandomFloatInterface
+{
+    public function generate(): float;
+}

src/TimeSourceInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace lewiscowles\core;
+
+interface TimeSourceInterface
+{
+    public function getTime(): int;
+}

src/Ulid.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace lewiscowles\core;
+
+final class Ulid
+{
+    const ENCODING = '0123456789ABCDEFGHJKMNPQRSTVWXYZ';
+    const ENCODING_LENGTH = 32;
+
+    private $time_src;
+    private $random_float_src;
+    
+    public function __construct(TimeSourceInterface $ts, RandomFloatInterface $rf)
+    {
+        $this->time_src = $ts;
+        $this->random_float_src = $rf;
+    }
+    
+    public function get(): string
+    {
+        return sprintf(
+            '%s%s',
+            $this->encodeTime($this->time_src->getTime(), 10),
+            $this->encodeRandom(16)
+        );
+    }
+    
+    private function encodeTime(int $time, int $length): string
+    {
+        $out = '';
+        while ($length > 0) {
+            $mod = (int) ($time % self::ENCODING_LENGTH);           
+            $out = self::ENCODING[$mod] . $out;
+            $time = ($time - $mod) / self::ENCODING_LENGTH;
+            $length--;
+        }
+
+        return $out;
+    }
+    
+    private function encodeRandom(int $length): string
+    {
+        $out = '';
+        while ($length > 0) {
+            $rand = (int) floor(self::ENCODING_LENGTH * $this->random_float_src->generate());
+            $out = self::ENCODING[$rand] . $out;
+            $length--;
+        }
+
+        return $out;
+    }
+}

src/ulid.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once __DIR__.'/../vendor/autoload.php';
-require_once __DIR__.'/../src/ulid.php';
-
 use lewiscowles\core\Ulid;
 use lewiscowles\core\LcgRandomGenerator;
 use lewiscowles\core\PHPTimeSource;