symfony
diff --git a/‎CHANGELOG-6.0.md
Copy file name to clipboardExpand all lines: CHANGELOG-6.0.md
+5Lines changed: 5 additions & 0 deletions b/‎CHANGELOG-6.0.md
Copy file name to clipboardExpand all lines: CHANGELOG-6.0.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎CHANGELOG-6.1.md
Copy file name to clipboardExpand all lines: CHANGELOG-6.1.md
+5Lines changed: 5 additions & 0 deletions b/‎CHANGELOG-6.1.md
Copy file name to clipboardExpand all lines: CHANGELOG-6.1.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Uid/Tests/UuidTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/UuidTest.php
+19Lines changed: 19 additions & 0 deletions b/‎src/Symfony/Component/Uid/Tests/UuidTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/UuidTest.php
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Uid/Uuid.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Uuid.php
+9-1Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Component/Uid/Uuid.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Uuid.php
+9-1Lines changed: 9 additions & 1 deletion
@@ -7,6 +7,11 @@ in 6.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.0.0...v6.0.1
 
+* 6.0.18 (2022-12-29)
+
+ * bug #48823 [Cache] Fix possibly null value passed to preg_match() in RedisTrait (chalasr)
+ * bug #48816 [Cache] Fix for RedisAdapter without auth parameter (rikvdh)
+
 * 6.0.17 (2022-12-28)
 
  * bug #48787 [PhpUnitBridge] Use verbose deprecation output for quiet types only when it reaches the threshold (ogizanagi)
 
@@ -7,6 +7,11 @@ in 6.1 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.1.0...v6.1.1
 
+* 6.1.10 (2022-12-29)
+
+ * bug #48823 [Cache] Fix possibly null value passed to preg_match() in RedisTrait (chalasr)
+ * bug #48816 [Cache] Fix for RedisAdapter without auth parameter (rikvdh)
+
 * 6.1.9 (2022-12-28)
 
  * bug #48787 [PhpUnitBridge] Use verbose deprecation output for quiet types only when it reaches the threshold (ogizanagi)
 
@@ -204,6 +204,25 @@ public function testIsValid()
         $this->assertTrue(UuidV4::isValid(self::A_UUID_V4));
     }
 
+    public function testIsValidWithNilUuid()
+    {
+        $this->assertTrue(Uuid::isValid('00000000-0000-0000-0000-000000000000'));
+        $this->assertTrue(NilUuid::isValid('00000000-0000-0000-0000-000000000000'));
+
+        $this->assertFalse(UuidV1::isValid('00000000-0000-0000-0000-000000000000'));
+        $this->assertFalse(UuidV4::isValid('00000000-0000-0000-0000-000000000000'));
+    }
+
+    public function testIsValidWithMaxUuid()
+    {
+        $this->assertTrue(Uuid::isValid('ffffffff-ffff-ffff-ffff-ffffffffffff'));
+        $this->assertTrue(Uuid::isValid('FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF'));
+        $this->assertTrue(Uuid::isValid('fFFFFFFF-ffff-FFFF-FFFF-FFFFffFFFFFF'));
+
+        $this->assertFalse(UuidV5::isValid('ffffffff-ffff-ffff-ffff-ffffffffffff'));
+        $this->assertFalse(UuidV6::isValid('ffffffff-ffff-ffff-ffff-ffffffffffff'));
+    }
+
     public function testEquals()
     {
         $uuid1 = new UuidV1(self::A_UUID_V1);
 
@@ -56,7 +56,7 @@ public static function fromString(string $uuid): static
             $uuid = substr_replace($uuid, '-', 18, 0);
             $uuid = substr_replace($uuid, '-', 23, 0);
         } elseif (26 === \strlen($uuid) && Ulid::isValid($uuid)) {
-            $ulid = new Ulid('00000000000000000000000000');
+            $ulid = new NilUlid();
             $ulid->uid = strtoupper($uuid);
             $uuid = $ulid->toRfc4122();
         }
@@ -132,6 +132,14 @@ final public static function v8(string $uuid): UuidV8
 
     public static function isValid(string $uuid): bool
     {
+        if (self::NIL === $uuid && \in_array(static::class, [__CLASS__, NilUuid::class], true)) {
+            return true;
+        }
+
+        if (__CLASS__ === static::class && 'ffffffff-ffff-ffff-ffff-ffffffffffff' === strtr($uuid, 'F', 'f')) {
+            return true;
+        }
+
         if (!preg_match('{^[0-9a-f]{8}(?:-[0-9a-f]{4}){2}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$}Di', $uuid)) {
             return false;
         }