Merge pull request #11 from ericthelin/feature-is-valid

Merging in pull request to create an isValid method

Author: ramsey

src/Rhumsaa/Uuid/Uuid.php

@@ -719,11 +719,12 @@ public function getUrn()
      */
     public function getVariant()
     {
-        if (0 === ($this->getClockSeqHiAndReserved() & 0x80)) {
+        $clockSeq = $this->getClockSeqHiAndReserved();
+        if (0 === ($clockSeq & 0x80)) {
             $variant = self::RESERVED_NCS;
-        } elseif (0 === ($this->getClockSeqHiAndReserved() & 0x40)) {
+        } elseif (0 === ($clockSeq & 0x40)) {
             $variant = self::RFC_4122;
-        } elseif (0 === ($this->getClockSeqHiAndReserved() & 0x20)) {
+        } elseif (0 === ($clockSeq & 0x20)) {
             $variant = self::RESERVED_MICROSOFT;
         } else {
             $variant = self::RESERVED_FUTURE;
@@ -778,7 +779,7 @@ public static function fromString($name)
         $name = str_replace(array('urn:', 'uuid:', '{', '}'), '', $name);
         $components = explode('-', $name);
 
-        if (count($components) != 5) {
+        if (!self::isValid($name)) {
             throw new \InvalidArgumentException('Invalid UUID string: ' . $name);
         }
 
@@ -794,6 +795,22 @@ public static function fromString($name)
         return new self($fields);
     }
 
+    /**
+     * Check if a string is a valid uuid
+     *
+     * @param string $uuid The uuid to test
+     * @return boolean
+     */
+    public static function isValid($uuid)
+    {
+        $uuid = str_replace(array('urn:', 'uuid:', '{', '}'), '', $uuid);
+
+        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;
+        }
+        return true;
+    }
+
     /**
      * Generate a version 1 UUID from a host ID, sequence number, and the current time.
      * If $node is not given, getMacAddress() is used to obtain the hardware

tests/Rhumsaa/Uuid/UuidTest.php

@@ -1226,4 +1226,112 @@ public function testIs64BitSystem()
         Uuid::$force32Bit = true;
         $this->assertFalse($is64BitSystem->invoke($uuid));
     }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodVersion1()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodVersion2()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-21e1-9b21-0800200c9a66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodVersion3()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-31e1-9b21-0800200c9a66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodVersion4()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-41e1-9b21-0800200c9a66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodVersion5()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-51e1-9b21-0800200c9a66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidBadVersion6()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57d-61e1-9b21-0800200c9a66');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidGoodUpperCase()
+    {
+        $valid = Uuid::isValid('FF6F8CB0-C57D-11E1-9B21-0800200C9A66');
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidBadHex()
+    {
+        $valid = Uuid::isValid('zf6f8cb0-c57d-11e1-9b21-0800200c9a66');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidTooShort1()
+    {
+        $valid = Uuid::isValid('3f6f8cb0-c57d-11e1-9b21-0800200c9a6');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidTooShort2()
+    {
+        $valid = Uuid::isValid('af6f8cb-c57d-11e1-9b21-0800200c9a66');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidNoDashes()
+    {
+        $valid = Uuid::isValid('af6f8cb0c57d11e19b210800200c9a66');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * @covers Rhumsaa\Uuid\Uuid::isValid
+     */
+    public function testIsValidTooLong()
+    {
+        $valid = Uuid::isValid('ff6f8cb0-c57da-51e1-9b21-0800200c9a66');
+        $this->assertFalse($valid);
+    }
 }