Unify InvalidUuidException and InvalidUlidException into single Inval…

…idUidException
symfony · rela589n · May 2, 2025 · May 6, 2025 · May 2, 2025 · dcec307ab0df390d56a63d4d71d6226bc04b793b
commit dcec307ab0df390d56a63d4d71d6226bc04b793b
diff --git a/...nt/Uid/Exception/InvalidUlidException.php → ...ent/Uid/Exception/InvalidUidException.php b/...nt/Uid/Exception/InvalidUlidException.php → ...ent/Uid/Exception/InvalidUidException.php
@@ -11,10 +11,6 @@

 namespace Symfony\Component\Uid\Exception;

-class InvalidUlidException extends InvalidArgumentException
+class InvalidUidException extends InvalidArgumentException
 {
-    public function __construct(string $value)
-    {
-        parent::__construct(\sprintf('Invalid ULID: "%s".', $value));
-    }
 }
diff --git a/src/Symfony/Component/Uid/Exception/InvalidUuidException.php b/src/Symfony/Component/Uid/Exception/InvalidUuidException.php
diff --git a/src/Symfony/Component/Uid/Tests/UlidTest.php b/src/Symfony/Component/Uid/Tests/UlidTest.php
@@ -13,7 +13,7 @@

 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Uid\Exception\InvalidArgumentException;
-use Symfony\Component\Uid\Exception\InvalidUlidException;
+use Symfony\Component\Uid\Exception\InvalidUidException;
 use Symfony\Component\Uid\MaxUlid;
 use Symfony\Component\Uid\NilUlid;
 use Symfony\Component\Uid\Tests\Fixtures\CustomUlid;
@@ -43,7 +43,7 @@ public function testGenerate()

    public function testWithInvalidUlid()
    {
-        $this->expectException(InvalidUlidException::class);
+        $this->expectException(InvalidUidException::class);
        $this->expectExceptionMessage('Invalid ULID: "this is not a ulid".');

        new Ulid('this is not a ulid');

diff --git a/src/Symfony/Component/Uid/Ulid.php b/src/Symfony/Component/Uid/Ulid.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Uid;

 use Symfony\Component\Uid\Exception\InvalidArgumentException;
-use Symfony\Component\Uid\Exception\InvalidUlidException;
+use Symfony\Component\Uid\Exception\InvalidUidException;

 /**
 * A ULID is lexicographically sortable and contains a 48-bit timestamp and 80-bit of crypto-random entropy.
@@ -39,7 +39,7 @@ public function __construct(?string $ulid = null)
            $this->uid = $ulid;
        } else {
            if (!self::isValid($ulid)) {
-                throw new InvalidUlidException($ulid);
+                throw new InvalidUidException(\sprintf('Invalid ULID: "%s".', $ulid));
            }

            $this->uid = strtoupper($ulid);

diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\Uid;

-use Symfony\Component\Uid\Exception\InvalidUuidException;
+use Symfony\Component\Uid\Exception\InvalidUidException;

 /**
 * @author Grégoire Pineau <lyrixx@lyrixx.info>
@@ -41,13 +41,13 @@ public function __construct(string $uuid, bool $checkVariant = false)
        $type = preg_match('{^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$}Di', $uuid) ? (int) $uuid[14] : false;

        if (false === $type || (static::TYPE ?: $type) !== $type) {
-            throw new InvalidUuidException(static::TYPE, $uuid);
+            throw new InvalidUidException(\sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
        }

        $this->uid = strtolower($uuid);

        if ($checkVariant && !\in_array($this->uid[19], ['8', '9', 'a', 'b'], true)) {
-            throw new InvalidUuidException(static::TYPE, $uuid);
+            throw new InvalidUidException(\sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
        }
    }