Merge branch 'master' into 3.2-merge

Author: limingxinleo

src/Str.php

@@ -1017,6 +1017,18 @@ public static function uuid(): UuidInterface
         return Uuid::uuid4();
     }
 
+    /**
+     * Generate a UUID (version 7).
+     */
+    public static function uuidv7(): UuidInterface
+    {
+        if (! class_exists(Uuid::class)) {
+            throw new RuntimeException('The "ramsey/uuid" package is required to use the "uuidv7" method. Please run "composer require ramsey/uuid".');
+        }
+
+        return Uuid::uuid7();
+    }
+
     /**
      * Generate a time-ordered UUID.
      */

src/Stringable.php

@@ -57,10 +57,8 @@ public function __get($key)
 
     /**
      * Get the raw string value.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->value;
     }

tests/StrTest.php

@@ -287,9 +287,15 @@ public function testUlid()
 
     public function testUuid()
     {
+        // test uuidv4
         $this->assertInstanceOf(UuidInterface::class, $uuid = Str::uuid());
         $this->assertTrue(Str::isUuid((string) $uuid));
 
+        // test uuidv7
+        $this->assertInstanceOf(UuidInterface::class, $uuid = Str::uuidv7());
+        $this->assertTrue(Str::isUuid((string) $uuid));
+
+        // test orderedUuid
         $this->assertInstanceOf(UuidInterface::class, $uuid = Str::orderedUuid());
         $this->assertTrue(Str::isUuid((string) $uuid));
     }