Merge pull request #8 from barryosull/feature/bug-with-overly-long-uuids

Fixing a bug where it accepted overly long UUIDs
barryosull · Jul 24, 2017 · 94919f2 · 94919f2
2 parents 82c62b3 + 9f6b6bb
commit 94919f2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 30 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/ValueObject/Uuid.php b/src/ValueObject/Uuid.php
@@ -7,7 +7,7 @@ class Uuid extends Type\AbstractSingleValue implements Identifier
 {
     protected function validator()
     {
-        return parent::validator()->regex('/([a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}?)/i');
+        return parent::validator()->regex('/([a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}?)$/i');
     }
 
     public function is_null()

diff --git a/test/Deserializer/CompositeErrorReporting.php b/test/Deserializer/CompositeErrorReporting.php
@@ -26,7 +26,7 @@ public function test_reporting_when_values_are_wrong()
         $exception = $this->fail_elegantly($encoded);
 
         $expected = [
-            "id" => ['"1234" must validate against "/([a-f\\\\d]{8}(-[a-f\\\\d]{4}){3}-[a-f\\\\d]{12}?)/i"'],
+            "id" => ['"1234" must validate against "/([a-f\\\\d]{8}(-[a-f\\\\d]{4}){3}-[a-f\\\\d]{12}?)$/i"'],
             "date" => ['"saads" must be a valid date']
         ];
 

diff --git a/test/ValueObject/Uuid.php b/test/ValueObject/Uuid.php
@@ -15,4 +15,10 @@ public function test_invalid_value()
         $this->setExpectedException(Assert\Exception::class);
         new Uuid("asdfasdf");
     }
+
+    public function test_fails_if_the_uuid_is_too_long()
+    {
+        $this->setExpectedException(Assert\Exception::class);
+        new Uuid("ac9e4e83-5495-4a58-90d9-eeeaf3989bc8a");
+    }
 }