fix: fix optional regex testcase for ecmascript support

Author: DannyvdSluijs

src/JsonSchema/Constraints/Drafts/Draft06/AdditionalPropertiesConstraint.php

@@ -47,7 +47,7 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
 
             foreach ($additionalProperties as $key => $_) {
                 foreach ($patterns as $pattern) {
-                    if (preg_match("/{$pattern}/", (string) $key)) {
+                    if (preg_match($this->createPregMatchPattern($pattern), (string) $key)) {
                         unset($additionalProperties[$key]);
                         break;
                     }
@@ -69,4 +69,26 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
             $this->addError(ConstraintError::ADDITIONAL_PROPERTIES(), $path, ['found' => $additionalPropertiesValue]);
         }
     }
+
+    private function createPregMatchPattern(string $pattern): string
+    {
+        $replacements = [
+//            '\D' => '[^0-9]',
+//            '\d' => '[0-9]',
+            '\p{digit}' => '\p{Nd}',
+//            '\w' => '[A-Za-z0-9_]',
+//            '\W' => '[^A-Za-z0-9_]',
+//            '\s' => '[\s\x{200B}]' // Explicitly include zero width white space,
+            '\p{Letter}' => '\p{L}', // Map ECMA long property name to PHP (PCRE) Unicode property abbreviations
+
+        ];
+//
+        $pattern = str_replace(
+            array_keys($replacements),
+            array_values($replacements),
+            $pattern
+        );
+
+        return '/' . str_replace('/', '\/', $pattern) . '/u';
+    }
 }

src/JsonSchema/Constraints/Drafts/Draft06/PatternConstraint.php

@@ -32,10 +32,32 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
             return;
         }
 
-        if (preg_match('/' . str_replace('/', '\/', $schema->pattern) . '/', $value) === 1) {
+        $matchPattern = $this->createPregMatchPattern($schema->pattern);
+        if (preg_match($matchPattern, $value) === 1) {
             return;
         }
 
         $this->addError(ConstraintError::PATTERN(), $path, ['found' => $value, 'pattern' => $schema->pattern]);
     }
+
+    private function createPregMatchPattern(string $pattern): string
+    {
+        $replacements = [
+            '\D' => '[^0-9]',
+            '\d' => '[0-9]',
+            '\p{digit}' => '[0-9]',
+            '\w' => '[A-Za-z0-9_]',
+            '\W' => '[^A-Za-z0-9_]',
+            '\s' => '[\s\x{200B}]', // Explicitly include zero width white space
+            '\p{Letter}' => '\p{L}', // Map ECMA long property name to PHP (PCRE) Unicode property abbreviations
+        ];
+
+        $pattern = str_replace(
+            array_keys($replacements),
+            array_values($replacements),
+            $pattern
+        );
+
+        return '/' . str_replace('/', '\/', $pattern) . '/u';
+    }
 }

src/JsonSchema/Constraints/Drafts/Draft06/PatternPropertiesConstraint.php

@@ -35,7 +35,8 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
 
         foreach ($properties as $propertyName => $propertyValue) {
             foreach ($schema->patternProperties as $patternPropertyRegex => $patternPropertySchema) {
-                if (preg_match('/' . str_replace('/', '\/', $patternPropertyRegex) . '/', (string) $propertyName)) {
+                $matchPattern = $this->createPregMatchPattern($patternPropertyRegex);
+                if (preg_match($matchPattern, (string) $propertyName)) {
                     $schemaConstraint = $this->factory->createInstanceFor('schema');
                     $schemaConstraint->check($propertyValue, $patternPropertySchema, $path, $i);
                     if ($schemaConstraint->isValid()) {
@@ -47,4 +48,25 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
             }
         }
     }
+
+    private function createPregMatchPattern(string $pattern): string
+    {
+        $replacements = [
+//            '\D' => '[^0-9]',
+            '\d' => '[0-9]',
+            '\p{digit}' => '[0-9]',
+//            '\w' => '[A-Za-z0-9_]',
+//            '\W' => '[^A-Za-z0-9_]',
+//            '\s' => '[\s\x{200B}]' // Explicitly include zero width white space
+            '\p{Letter}' => '\p{L}', // Map ECMA long property name to PHP (PCRE) Unicode property abbreviations
+        ];
+//
+        $pattern = str_replace(
+            array_keys($replacements),
+            array_values($replacements),
+            $pattern
+        );
+
+        return '/' . str_replace('/', '\/', $pattern) . '/u';
+    }
 }

tests/JsonSchemaTestSuiteTest.php

@@ -40,7 +40,7 @@ public function testTestCaseValidatesCorrectly(
             $validator->validate($data, $schema, Constraint::CHECK_MODE_NORMAL | Constraint::CHECK_MODE_STRICT);
         } catch (\Exception $e) {
             if ($optional) {
-                $this->markTestSkipped('Optional test case would during validate() invocation');
+                $this->markTestSkipped('Optional test case throws exception during validate() invocation');
             }
 
             throw $e;