symfony · rela589n · Apr 5, 2025 · Apr 7, 2025 · Apr 10, 2025
diff --git a/src/Symfony/Component/Uid/CHANGELOG.md b/src/Symfony/Component/Uid/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========

+7.3
+---
+
+ * Add `Symfony\Component\Uid\InvalidUuidException`
+ * Add `Symfony\Component\Uid\InvalidUlidException`
+
 7.2
 ---


diff --git a/src/Symfony/Component/Uid/InvalidUlidException.php b/src/Symfony/Component/Uid/InvalidUlidException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid;
+
+final class InvalidUlidException extends \InvalidArgumentException
+{
+    public function __construct(
+        private readonly string $value,
+    ) {
+        parent::__construct(\sprintf('Invalid ULID: "%s".', $this->value));
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/src/Symfony/Component/Uid/InvalidUuidException.php b/src/Symfony/Component/Uid/InvalidUuidException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Uid;
+
+final class InvalidUuidException extends \InvalidArgumentException
+{
+    public function __construct(
+        private readonly int $type,
+        private readonly string $value,
+    ) {
+        parent::__construct(\sprintf('Invalid UUID%s: "%s".', $this->type ? 'v'.$this->type : '', $this->value));
+    }
+
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/src/Symfony/Component/Uid/Tests/UlidTest.php b/src/Symfony/Component/Uid/Tests/UlidTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Uid\Tests;

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

    public function testWithInvalidUlid()
    {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidUlidException::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
@@ -36,7 +36,7 @@ public function __construct(?string $ulid = null)
            $this->uid = $ulid;
        } else {
            if (!self::isValid($ulid)) {
-                throw new \InvalidArgumentException(\sprintf('Invalid ULID: "%s".', $ulid));
+                throw new InvalidUlidException($ulid);
            }

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

diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -39,13 +39,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 \InvalidArgumentException(\sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
+            throw new InvalidUuidException(static::TYPE, $uuid);
        }

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

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