symfony
diff --git a/‎src/Symfony/Component/Uid/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Uid/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Uid/NilUlid.php
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Uid/NilUlid.php
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Uid/Tests/UlidTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/UlidTest.php
+23Lines changed: 23 additions & 0 deletions b/‎src/Symfony/Component/Uid/Tests/UlidTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/UlidTest.php
+23Lines changed: 23 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Uid/Ulid.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Ulid.php
+10-2Lines changed: 10 additions & 2 deletions b/‎src/Symfony/Component/Uid/Ulid.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Ulid.php
+10-2Lines changed: 10 additions & 2 deletions
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.4
+---
+
+ * Add `NilUlid`
+
 5.3
 ---
 
 
@@ -0,0 +1,20 @@
+<?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;
+
+class NilUlid extends Ulid
+{
+    public function __construct()
+    {
+        $this->uid = parent::NIL;
+    }
+}
@@ -12,8 +12,12 @@
 namespace Symfony\Component\Uid\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\NilUlid;
+use Symfony\Component\Uid\NilUuid;
 use Symfony\Component\Uid\Tests\Fixtures\CustomUlid;
 use Symfony\Component\Uid\Ulid;
+use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\UuidV1;
 use Symfony\Component\Uid\UuidV4;
 
 class UlidTest extends TestCase
@@ -237,4 +241,23 @@ public function testFromStringOnExtendedClassReturnsStatic()
     {
         $this->assertInstanceOf(CustomUlid::class, CustomUlid::fromString((new CustomUlid())->toBinary()));
     }
+
+
+    /**
+     * @testWith    ["00000000-0000-0000-0000-000000000000"]
+     *              ["1111111111111111111111"]
+     *              ["00000000000000000000000000"]
+     */
+    public function testNilUlid(string $ulid)
+    {
+        $ulid = Ulid::fromString($ulid);
+
+        $this->assertInstanceOf(NilUlid::class, $ulid);
+        $this->assertSame('00000000000000000000000000', (string) $ulid);
+    }
+
+    public function testNewNilUlid()
+    {
+        $this->assertSame('00000000000000000000000000', (string) new NilUlid());
+    }
 }
@@ -20,7 +20,7 @@
  */
 class Ulid extends AbstractUid
 {
-    private const NIL = '00000000000000000000000000';
+    protected const NIL = '00000000000000000000000000';
 
     private static $time = '';
     private static $rand = [];
@@ -67,10 +67,14 @@ public static function fromString(string $ulid): parent
         if (36 === \strlen($ulid) && Uuid::isValid($ulid)) {
             $ulid = (new Uuid($ulid))->toBinary();
         } elseif (22 === \strlen($ulid) && 22 === strspn($ulid, BinaryUtil::BASE58[''])) {
-            $ulid = BinaryUtil::fromBase($ulid, BinaryUtil::BASE58);
+            $ulid = str_pad(BinaryUtil::fromBase($ulid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
         }
 
         if (16 !== \strlen($ulid)) {
+            if (self::NIL === $ulid) {
+                return new NilUlid();
+            }
+
             return new static($ulid);
         }
 
@@ -85,6 +89,10 @@ public static function fromString(string $ulid): parent
             base_convert(substr($ulid, 27, 5), 16, 32)
         );
 
+        if (self::NIL === $ulid) {
+            return new NilUlid();
+        }
+
         $u = new static(self::NIL);
         $u->uid = strtr($ulid, 'abcdefghijklmnopqrstuv', 'ABCDEFGHJKMNPQRSTVWXYZ');