More unit tests, use $matcheswith preg_match() (#30)

Author: oittaa

src/UUID.php

@@ -58,11 +58,8 @@ class UUID
     public const TIME_OFFSET_INT = 0x01b21dd213814000;
 
     /** @internal */
-    private const REPLACE_ARR = array('urn:', 'uuid:', '-', '{', '}');
-
-    /** @internal */
-    private const UUID_REGEX = '/^(?:urn:)?(?:uuid:)?(\{)?[0-9a-f]{8}\-?[0-9a-f]{4}'
-    . '\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?[0-9a-f]{12}(?(1)\}|)$/i';
+    private const UUID_REGEX = '/^(?:urn:)?(?:uuid:)?(\{)?([0-9a-f]{8})\-?([0-9a-f]{4})'
+    . '\-?([0-9a-f]{4})\-?([0-9a-f]{4})\-?([0-9a-f]{12})(?(1)\}|)$/i';
 
     /** @internal */
     private static $unixts = 0;
@@ -94,11 +91,11 @@ private static function getUnixTime(): array
     /** @internal */
     private static function stripExtras(string $uuid): string
     {
-        if (!self::isValid($uuid)) {
+        if (preg_match(self::UUID_REGEX, $uuid, $m) !== 1) {
             throw new \InvalidArgumentException('Invalid UUID string: ' . $uuid);
         }
         // Get hexadecimal components of UUID
-        return strtolower(str_replace(self::REPLACE_ARR, '', $uuid));
+        return strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6]);
     }
 
     /** @internal */

tests/UuidTest.php

@@ -99,6 +99,12 @@ public function testCanValidate()
         $this->assertTrue(
             UUID::isValid('11a38b9a-b3da-360f-9353-a5a725514269')
         );
+        $this->assertFalse(
+            UUID::isValid('11a38b9a-b3da-360f-9353-a5a72551426')
+        );
+        $this->assertFalse(
+            UUID::isValid('11a38b9a-b3da-360f-9353-a5a7255142690')
+        );
         $this->assertTrue(
             UUID::isValid('urn:uuid:c4a760a8-dbcf-5254-a0d9-6a4474bd1b62')
         );
@@ -181,6 +187,14 @@ public function testCanUseAliases()
         );
     }
 
+    public function testKnownGetTime()
+    {
+        $uuid6_time = UUID::getTime('1ebacf4f-a4a8-68ee-b4ec-618c14d005d5');
+        $this->assertSame($uuid6_time, '1620145373.6118510');
+        $uuid7_time = UUID::getTime('061a3d43-61d0-7cf4-bfce-753dadab55e1');
+        $this->assertSame($uuid7_time, '1638126646.1903860');
+    }
+
     public function testGetTimeValid()
     {
         $now = microtime(true);