[BUGFIX] Add unicode support in patternProperties and in format constraints (#338)

Author: jbaron-gingco

src/JsonSchema/Constraints/FormatConstraint.php

@@ -146,7 +146,7 @@ protected function validateDateTime($datetime, $format)
 
     protected function validateRegex($regex)
     {
-        return false !== @preg_match('/' . $regex . '/', '');
+        return false !== @preg_match('/' . $regex . '/u', '');
     }
 
     protected function validateColor($color)

src/JsonSchema/Constraints/ObjectConstraint.php

@@ -56,12 +56,12 @@ public function validatePatternProperties($element, JsonPointer $path = null, $p
             }
 
             // Validate the pattern before using it to test for matches
-            if (@preg_match($delimiter. $pregex . $delimiter, '') === false) {
+            if (@preg_match($delimiter. $pregex . $delimiter . 'u', '') === false) {
                 $this->addError($path, 'The pattern "' . $pregex . '" is invalid', 'pregex', array('pregex' => $pregex,));
                 continue;
             }
             foreach ($element as $i => $value) {
-                if (preg_match($delimiter . $pregex . $delimiter, $i)) {
+                if (preg_match($delimiter . $pregex . $delimiter . 'u', $i)) {
                     $matches[] = $i;
                     $this->checkUndefined($value, $schema ? : new \stdClass(), $path, $i);
                 }

tests/Constraints/FormatTest.php

@@ -33,11 +33,17 @@ public function testRegex()
         $schema = new \stdClass;
         $schema->format = 'regex';
 
+        $validator->reset();
         $validator->check('\d+', $schema);
         $this->assertEmpty($validator->getErrors());
 
+        $validator->reset();
         $validator->check('^(abc]', $schema);
         $this->assertCount(1, $validator->getErrors());
+
+        $validator->reset();
+        $validator->check('^猡猡獛$', $schema);
+        $this->assertEmpty($validator->getErrors());
     }
 
     /**

tests/Constraints/PatternPropertiesTest.php

@@ -52,6 +52,21 @@ public function getInvalidTests()
                         "additionalProperties" => false
                     ))
             ),
+            // Does not match pattern with unicode
+            array(
+                json_encode(array(
+                        '猡猡獛' => false,
+                    )),
+                json_encode(array(
+                        'type' => 'object',
+                        'patternProperties' => array(
+                            '^[\\x{0080}-\\x{006FFF}]+$' => array(
+                                'type' => array('boolean')
+                            )
+                        ),
+                        "additionalProperties" => false
+                    ))
+            ),
             // An invalid regular expression pattern
             array(
                 json_encode(array(
@@ -177,6 +192,21 @@ public function getValidTests()
                         "additionalProperties" => false
                     ))
             ),
+            // Does match pattern with unicode
+            array(
+                json_encode(array(
+                    'ðæſ' => 'unicode',
+                )),
+                json_encode(array(
+                    'type' => 'object',
+                    'patternProperties' => array(
+                        '^[\\x{0080}-\\x{10FFFF}]+$' => array(
+                            'type' => array('string')
+                        )
+                    ),
+                    "additionalProperties" => false
+                ))
+            ),
         );
     }
 }