Fix getTime() with UUIDv7 (#51)

Author: oittaa

src/UUID.php

@@ -271,7 +271,7 @@ public static function getTime(string $uuid): ?string
             $retval .= substr_replace(str_pad(strval($ts), 8, '0', \STR_PAD_LEFT), '.', -7, 0);
         } elseif ($version === 7) {
             $unixts = hexdec(substr($timehex, 0, 13));
-            $subsec = self::decodeSubsec(hexdec(substr($timehex, 13)) + (hexdec(substr($uuid, 16, 1)) >> 4 & 0x03));
+            $subsec = self::decodeSubsec((hexdec(substr($timehex, 13)) << 2) + (hexdec(substr($uuid, 16, 1)) & 0x03));
             $retval = strval($unixts * self::V7_SUBSEC_RANGE + $subsec);
             $retval = substr_replace(str_pad($retval, 8, '0', \STR_PAD_LEFT), '.', -7, 0);
         }

tests/UuidTest.php

@@ -58,6 +58,10 @@ public function testCanGenerateValidVersion6()
                 $uuid1,
                 $uuid2
             );
+            $this->assertGreaterThan(
+                UUID::getTime($uuid1),
+                UUID::getTime($uuid2)
+            );
             $this->assertLessThan(
                 0,
                 UUID::cmp($uuid1, $uuid2)
@@ -79,6 +83,10 @@ public function testCanGenerateValidVersion7()
                 $uuid1,
                 $uuid2
             );
+            $this->assertGreaterThan(
+                UUID::getTime($uuid1),
+                UUID::getTime($uuid2)
+            );
             $this->assertLessThan(
                 0,
                 UUID::cmp($uuid1, $uuid2)
@@ -238,6 +246,6 @@ public function testGetTimeMax()
         $uuid6_time = UUID::getTime('ffffffff-ffff-6fff-bfff-ffffffffffff');
         $this->assertSame('103072857660.6846975', $uuid6_time);
         $uuid7_time = UUID::getTime('ffffffff-ffff-7fff-bfff-ffffffffffff');
-        $this->assertSame('281474976710.6552500', $uuid7_time);
+        $this->assertSame('281474976710.6560000', $uuid7_time);
     }
 }