Fixed NIL bug in isValid() method, reported by @ocubom in PR #11

ramsey · Apr 29, 2013 · 9d175d1 · 9d175d1
1 parent 79a655e
commit 9d175d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Rhumsaa/Uuid/Uuid.php b/src/Rhumsaa/Uuid/Uuid.php
@@ -805,6 +805,10 @@ public static function isValid($uuid)
     {
         $uuid = str_replace(array('urn:', 'uuid:', '{', '}'), '', $uuid);
 
+        if ($uuid == self::NIL) {
+            return true;
+        }
+
         if (!preg_match('/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[1-5][0-9A-Fa-f]{3}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/', $uuid)) {
             return false;
         }

diff --git a/tests/Rhumsaa/Uuid/UuidTest.php b/tests/Rhumsaa/Uuid/UuidTest.php
@@ -1334,4 +1334,13 @@ public function testIsValidTooLong()
         $valid = Uuid::isValid('ff6f8cb0-c57da-51e1-9b21-0800200c9a66');
         $this->assertFalse($valid);
     }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testUsingNilAsValidUuid()
+    {
+        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', Uuid::uuid3(Uuid::NIL, 'randomtext'));
+        $this->assertInstanceOf('Rhumsaa\Uuid\Uuid', Uuid::uuid5(Uuid::NIL, 'randomtext'));
+    }
 }