From c49e9015774a76cdcff2900455b899a633d6769c Mon Sep 17 00:00:00 2001
From: Karem Sobhy <admin@karemcloud.com>
Date: Thu, 18 Jul 2024 21:44:28 +0300
Subject: [PATCH] [11.x] Implement HasV7Uuids to use with MariaDB native uuid
 data type (#52029)

* implement HasV7UUids

* Implement all uuid4 methods to uuid7 for unified experience and add ability to define time for the uuid7

* formatting

* formatting

* remove property

---------

Co-authored-by: Taylor Otwell <taylor@laravel.com>
---
 .../Eloquent/Concerns/HasVersion7Uuids.php    | 20 +++++++++++++++++++
 src/Illuminate/Support/Str.php                | 13 ++++++++++++
 tests/Support/SupportStrTest.php              |  3 ++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 src/Illuminate/Database/Eloquent/Concerns/HasVersion7Uuids.php

diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasVersion7Uuids.php b/src/Illuminate/Database/Eloquent/Concerns/HasVersion7Uuids.php
new file mode 100644
index 000000000000..455bf74aa576
--- /dev/null
+++ b/src/Illuminate/Database/Eloquent/Concerns/HasVersion7Uuids.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Illuminate\Database\Eloquent\Concerns;
+
+use Illuminate\Support\Str;
+
+trait HasVersion7Uuids
+{
+    use HasUuids;
+
+    /**
+     * Generate a new UUID (version 7) for the model.
+     *
+     * @return string
+     */
+    public function newUniqueId()
+    {
+        return (string) Str::uuid7();
+    }
+}
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
index 5dcbd182e3c4..a9ff9aae2133 100644
--- a/src/Illuminate/Support/Str.php
+++ b/src/Illuminate/Support/Str.php
@@ -1736,6 +1736,19 @@ public static function uuid()
                     : Uuid::uuid4();
     }
 
+    /**
+     * Generate a UUID (version 7).
+     *
+     * @param  \DateTimeInterface|null  $time
+     * @return \Ramsey\Uuid\UuidInterface
+     */
+    public static function uuid7($time = null)
+    {
+        return static::$uuidFactory
+                    ? call_user_func(static::$uuidFactory)
+                    : Uuid::uuid7($time);
+    }
+
     /**
      * Generate a time-ordered UUID.
      *
diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
index 725326e7e8aa..15e142574b3f 100755
--- a/tests/Support/SupportStrTest.php
+++ b/tests/Support/SupportStrTest.php
@@ -1101,6 +1101,7 @@ public function testUuid()
     {
         $this->assertInstanceOf(UuidInterface::class, Str::uuid());
         $this->assertInstanceOf(UuidInterface::class, Str::orderedUuid());
+        $this->assertInstanceOf(UuidInterface::class, Str::uuid7());
     }
 
     public function testAsciiNull()
@@ -1354,7 +1355,7 @@ public function testItCanSpecifyASequenceOfUuidsToUtilise()
     {
         Str::createUuidsUsingSequence([
             0 => ($zeroth = Str::uuid()),
-            1 => ($first = Str::uuid()),
+            1 => ($first = Str::uuid7()),
             // just generate a random one here...
             3 => ($third = Str::uuid()),
             // continue to generate random uuids...