[Uid] Add UuidV6::fromV1() and UuidV7::fromV1() methods

Author: fancyweb

src/Symfony/Component/Uid/BinaryUtil.php

@@ -118,8 +118,10 @@ public static function add(string $a, string $b): string
 
     /**
      * @param string $time Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 in hexadecimal
+     *
+     * @return string Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 as a numeric string
      */
-    public static function hexToDateTime(string $time): \DateTimeImmutable
+    public static function hexToNumericString(string $time): string
     {
         if (\PHP_INT_SIZE >= 8) {
             $time = (string) (hexdec($time) - self::TIME_OFFSET_INT);
@@ -140,7 +142,17 @@ public static function hexToDateTime(string $time): \DateTimeImmutable
             $time = '-' === $time[0] ? '-'.str_pad(substr($time, 1), 8, '0', \STR_PAD_LEFT) : str_pad($time, 8, '0', \STR_PAD_LEFT);
         }
 
-        return \DateTimeImmutable::createFromFormat('U.u?', substr_replace($time, '.', -7, 0));
+        return $time;
+    }
+
+    /**
+     * Sub-microseconds are lost since they are not handled by \DateTimeImmutable.
+     *
+     * @param string $time Count of 100-nanosecond intervals since the UUID epoch 1582-10-15 00:00:00 in hexadecimal
+     */
+    public static function hexToDateTime(string $time): \DateTimeImmutable
+    {
+        return \DateTimeImmutable::createFromFormat('U.u?', substr_replace(self::hexToNumericString($time), '.', -7, 0));
     }
 
     /**

src/Symfony/Component/Uid/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Add `UuidV6::fromV1()` and `UuidV7::fromV1()`
+
 6.2
 ---
 

src/Symfony/Component/Uid/Tests/UuidTest.php

@@ -427,4 +427,33 @@ public function testFromStringBase58Padding()
     {
         $this->assertInstanceOf(Uuid::class, Uuid::fromString('111111111u9QRyVM94rdmZ'));
     }
+
+    public function testV6FromV1()
+    {
+        $uuidV1 = new UuidV1('8189d3de-9670-11ee-b9d1-0242ac120002');
+        $uuidV6 = UuidV6::fromV1($uuidV1);
+
+        $this->assertEquals($uuidV1->getDateTime(), $uuidV6->getDateTime());
+        $this->assertSame($uuidV1->getNode(), $uuidV6->getNode());
+        $this->assertEquals($uuidV6, UuidV6::fromV1($uuidV1));
+    }
+
+    public function testV7FromV1BeforeUnixEpochThrows()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('UUIDv1 with a timestamp before Unix epoch cannot be converted to UUIDv7');
+
+        UuidV7::fromV1(new UuidV1('9aba8000-ff00-11b0-b3db-3b3fc83afdfc')); // Timestamp is 1969-01-01 00:00:00.0000000
+    }
+
+    public function testV7FromV1()
+    {
+        $uuidV1 = new UuidV1('eb248d80-ea4f-11ec-9d2a-839425e6fb88');
+        $sameUuidV1100NanosecondsLater = new UuidV1('eb248d81-ea4f-11ec-9d2a-839425e6fb88');
+        $uuidV7 = UuidV7::fromV1($uuidV1);
+
+        $this->assertEquals($uuidV1->getDateTime(), $uuidV7->getDateTime());
+        $this->assertEquals($uuidV7, UuidV7::fromV1($uuidV1));
+        $this->assertNotEquals($uuidV7, UuidV7::fromV1($sameUuidV1100NanosecondsLater));
+    }
 }

src/Symfony/Component/Uid/UuidV6.php

@@ -43,6 +43,13 @@ public function getNode(): string
         return substr($this->uid, 24);
     }
 
+    public static function fromV1(UuidV1 $uuidV1): self
+    {
+        $uuidV1 = $uuidV1->toRfc4122();
+
+        return new self(substr($uuidV1, 15, 3).substr($uuidV1, 9, 4).$uuidV1[0].'-'.substr($uuidV1, 1, 4).'-6'.substr($uuidV1, 5, 3).substr($uuidV1, 18, 6).substr($uuidV1, 24));
+    }
+
     public static function generate(\DateTimeInterface $time = null, Uuid $node = null): string
     {
         $uuidV1 = UuidV1::generate($time, $node);

src/Symfony/Component/Uid/UuidV7.php

@@ -49,6 +49,28 @@ public function getDateTime(): \DateTimeImmutable
         return \DateTimeImmutable::createFromFormat('U.v', substr_replace($time, '.', -3, 0));
     }
 
+    /**
+     * Sub-millisecond timestamp precision is lost since UUIDv7 don't support it.
+     */
+    public static function fromV1(UuidV1 $uuidV1): self
+    {
+        $uuidV1 = $uuidV1->toRfc4122();
+        $time = '0'.substr($uuidV1, 15, 3).substr($uuidV1, 9, 4).substr($uuidV1, 0, 8);
+        $time = BinaryUtil::hexToNumericString($time);
+        if ('-' === $time[0]) {
+            throw new \InvalidArgumentException('UUIDv1 with a timestamp before Unix epoch cannot be converted to UUIDv7');
+        }
+
+        $time = str_pad($time, 5, '0', \STR_PAD_LEFT);
+
+        return new self(substr_replace(sprintf(
+            '%012s-7%03s-%s',
+            \PHP_INT_SIZE >= 8 ? dechex(substr($time, 0, -4)) : bin2hex(BinaryUtil::fromBase(substr($time, 0, -4), BinaryUtil::BASE10)),
+            dechex((int) substr($time, -4, 3)),
+            substr($uuidV1, 19)
+        ), '-', 8, 0));
+    }
+
     public static function generate(\DateTimeInterface $time = null): string
     {
         if (null === $mtime = $time) {