refactor to use OrderedTimeCodec

Author: freekmurze

src/HasBinaryUuid.php

@@ -49,19 +49,17 @@ public static function scopeWithUuidRelation(Builder $builder, $uuid, string $fi
         }, $uuid));
     }
 
-    public static function encodeUuid(string $uuid): string
+    public static function encodeUuid($uuid): string
     {
         if (! Uuid::isValid($uuid)) {
             return $uuid;
         }
 
-        $uuid = str_replace('-', '', (string) $uuid);
+        if (! $uuid instanceof Uuid) {
+            $uuid = Uuid::fromString($uuid);
+        }
 
-        return
-            substr(hex2bin($uuid), 6, 2)
-            .substr(hex2bin($uuid), 4, 2)
-            .substr(hex2bin($uuid), 0, 4)
-            .substr(hex2bin($uuid), 8, 8);
+        return $uuid->getBytes();
     }
 
     public static function decodeUuid(string $binaryUuid): string
@@ -70,18 +68,7 @@ public static function decodeUuid(string $binaryUuid): string
             return $binaryUuid;
         }
 
-        $uuidWithoutDashes = bin2hex(
-            substr($binaryUuid, 4, 4)
-            .substr($binaryUuid, 2, 2)
-            .substr($binaryUuid, 0, 2)
-            .substr($binaryUuid, 8, 8)
-        );
-
-        $uuidWithDashes = collect([8, 13, 18, 23])->reduce(function ($uuid, $position) {
-            return substr_replace($uuid, '-', $position, 0);
-        }, $uuidWithoutDashes);
-
-        return $uuidWithDashes;
+        return Uuid::fromBytes($binaryUuid)->toString();
     }
 
     public function getUuidTextAttribute(): string

src/UuidServiceProvider.php

@@ -8,6 +8,9 @@
 use Illuminate\Database\Schema\Grammars\Grammar;
 use Illuminate\Database\Query\Grammars\MySqlGrammar as IlluminateMySqlGrammar;
 use Illuminate\Database\Query\Grammars\SQLiteGrammar as IlluminateSQLiteGrammar;
+use Ramsey\Uuid\Codec\OrderedTimeCodec;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidFactory;
 
 class UuidServiceProvider extends ServiceProvider
 {
@@ -17,6 +20,8 @@ public function boot()
         $connection = app('db')->connection();
 
         $connection->setSchemaGrammar($this->createGrammarFromConnection($connection));
+
+        $this->optimizeUuids();
     }
 
     protected function createGrammarFromConnection(Connection $connection): Grammar
@@ -38,4 +43,15 @@ protected function createGrammarFromConnection(Connection $connection): Grammar
 
         return new MySqlGrammar();
     }
+
+    protected function optimizeUuids(): void
+    {
+        $factory = new UuidFactory();
+
+        $codec = new OrderedTimeCodec($factory->getUuidBuilder());
+
+        $factory->setCodec($codec);
+
+        Uuid::setFactory($factory);
+    }
 }