Merge pull request #23 from teamleadercrm/handle-uuid-exceptions

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "teamleadercrm/uuidifier",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "require": {
         "php": "^8.1",
         "ramsey/uuid": ">=4.5 <4.6",

src/Uuidifier.php

@@ -2,10 +2,10 @@
 
 namespace Teamleader\Uuidifier;
 
-use InvalidArgumentException;
 use Ramsey\Uuid\Codec\StringCodec;
 use Ramsey\Uuid\Converter\Number\GenericNumberConverter;
 use Ramsey\Uuid\Converter\Time\GenericTimeConverter;
+use Ramsey\Uuid\Exception\UuidExceptionInterface;
 use Ramsey\Uuid\Math\BrickMathCalculator;
 use Ramsey\Uuid\UuidFactory;
 use Ramsey\Uuid\UuidInterface;
@@ -53,6 +53,9 @@ public function encode(string $prefix, int $id): UuidInterface
         return $uuidFactory->uuid($bytes);
     }
 
+    /**
+     * @throws UuidExceptionInterface
+     */
     public function decode(UuidInterface $uuid): int
     {
         if ($uuid->getVersion() !== self::VERSION) {
@@ -68,7 +71,11 @@ public function decode(UuidInterface $uuid): int
     public function isValid(string $prefix, UuidInterface $uuid): bool
     {
         if ($uuid->getVersion() !== self::VERSION) {
-            $uuid = $this->transformUnknownUuidIntoUuidVersionZero($uuid);
+            try {
+                $uuid = $this->transformUnknownUuidIntoUuidVersionZero($uuid);
+            } catch (UuidExceptionInterface) {
+                return false;
+            }
         }
 
         $decoded = $this->decode($uuid);
@@ -77,6 +84,9 @@ public function isValid(string $prefix, UuidInterface $uuid): bool
         return $uuid->equals($encoded);
     }
 
+    /**
+     * @throws UuidExceptionInterface
+     */
     private function transformUnknownUuidIntoUuidVersionZero(UuidInterface $uuid): UuidInterface
     {
         return UuidV0::fromString($uuid->toString());

tests/UuidifierTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\UuidInterface;
 use Teamleader\Uuidifier\Nonstandard\UuidV0;
@@ -73,6 +74,18 @@ public function uuidWithDifferentPrefixIsInvalid()
         $this->assertFalse($generator->isValid('bar', $uuid));
     }
 
+    /**
+     * @test
+     */
+    public function uuidWithInvalidVersionIsInvalid(): void
+    {
+        $generator = new Uuidifier();
+
+        $uuid = Uuid::fromString('018dc552-ce8c-77ad-8c27-289ac479d815'); // V7 UUID
+
+        Assert::assertFalse($generator->isValid('foo', $uuid));
+    }
+
     /**
      * @test
      */