Revert "Validate version and variant for UUID (#48321)" (#48385)

This reverts commit 1591fed.
laravel · Sep 13, 2023 · f5c86ee · f5c86ee
1 parent 737cdec
commit f5c86ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -520,11 +520,7 @@ public static function isUuid($value)
             return false;
         }
 
-        if ($value === '00000000-0000-0000-0000-000000000000') {
-            return true;
-        }
-
-        return preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iD', $value) > 0;
+        return preg_match('/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iD', $value) > 0;
     }
 
     /**

diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
@@ -965,8 +965,6 @@ public static function invalidUuidList()
             ['af6f8cb-c57d-11e1-9b21-0800200c9a66'],
             ['af6f8cb0c57d11e19b210800200c9a66'],
             ['ff6f8cb0-c57da-51e1-9b21-0800200c9a66'],
-            ['ff6f8cb0-c57d-11e1-cb21-0800200c9a66'], // Invalid variant
-            ['ff6f8cb0-c57d-61e1-9b21-0800200c9a66'], // Invalid version
         ];
     }