Fix regex format validation and fix the regex format unit tests.

Author: Michael Chiocca

src/JsonSchema/Constraints/Format.php

@@ -56,7 +56,9 @@ public function check($element, $schema = null, $path = null, $i = null)
                 break;
 
             case 'regex':
-                $this->validateRegex($path, $element, $schema->pattern);
+                if (!$this->validateRegex($element)) {
+                    $this->addError($path, 'Invalid regex format ' . $element);
+                }
                 break;
 
             case 'color':
@@ -124,13 +126,9 @@ protected function validateDateTime($datetime, $format)
         return $datetime === $dt->format($format);
     }
 
-    protected function validateRegex($path, $element, $regex)
+    protected function validateRegex($regex)
     {
-        if (false === @preg_match('/' . $regex . '/', '')) {
-            $this->addError($path, 'Invalid regex format ' . $regex);
-        } else if (!preg_match('/' . $regex . '/', $element)) {
-            $this->addError($path, sprintf('%s does not match regex format %s', json_encode($element), $regex));
-        }
+        return false !== @preg_match('/' . $regex . '/', '');
     }
 
     protected function validateColor($color)

tests/JsonSchema/Tests/Constraints/FormatTest.php

@@ -27,12 +27,11 @@ public function testRegex()
         $validator = new Format();
         $schema = new \stdClass;
         $schema->format = 'regex';
-        $schema->pattern = '\d+';
 
-        $validator->check('10', $schema);
+        $validator->check('\d+', $schema);
         $this->assertEmpty($validator->getErrors());
 
-        $validator->check('ten', $schema);
+        $validator->check('^(abc]', $schema);
         $this->assertCount(1, $validator->getErrors());
     }