Merge pull request #2 from brianjmiller/uuid-drop-version

Remove restriction of version on UUID
RusticiSoftware · Mar 13, 2014 · b3ad2d1 · b3ad2d1
2 parents c6e19cb + a6bc256
commit b3ad2d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Context.php b/src/Context.php
@@ -68,7 +68,7 @@ public function __construct() {
 
     public function setRegistration($value) {
         if (isset($value) && ! preg_match(Util::UUID_REGEX, $value)) {
-            throw new InvalidArgumentException('arg1 must be a UUIDv4');
+            throw new InvalidArgumentException('arg1 must be a UUID');
         }
         $this->registration = $value;
         return $this;

diff --git a/src/State.php b/src/State.php
@@ -52,7 +52,7 @@ public function getAgent() { return $this->agent; }
 
     public function setRegistration($value) {
         if (isset($value) && ! preg_match(Util::UUID_REGEX, $value)) {
-            throw new InvalidArgumentException('arg1 must be a UUIDv4');
+            throw new InvalidArgumentException('arg1 must be a UUID');
         }
 
         $this->registration = $value;

diff --git a/src/Statement.php b/src/Statement.php
@@ -89,7 +89,7 @@ public function stamp() {
 
     public function setId($value) {
         if (isset($value) && ! preg_match(Util::UUID_REGEX, $value)) {
-            throw new InvalidArgumentException('arg1 must be a UUIDv4');
+            throw new InvalidArgumentException('arg1 must be a UUID');
         }
         $this->id = $value;
         return $this;

diff --git a/src/StatementRef.php b/src/StatementRef.php
@@ -42,7 +42,7 @@ public function getObjectType() { return $this->objectType; }
 
     public function setId($value) {
         if (isset($value) && ! preg_match(Util::UUID_REGEX, $value)) {
-            throw new InvalidArgumentException('arg1 must be a UUIDv4');
+            throw new InvalidArgumentException('arg1 must be a UUID');
         }
         $this->id = $value;
         return $this;

diff --git a/src/Util.php b/src/Util.php
@@ -19,7 +19,7 @@
 
 class Util
 {
-    const UUID_REGEX = '/[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}/';
+    const UUID_REGEX = '/[a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}/i';
 
     //
     // Based on code from