Merge pull request #159 from goetas-webservices/regex-unicode-props

Add basic support for unicode blocknames
goetas-webservices · Aug 30, 2023 · 505fef8 · 505fef8
2 parents ac0e34a + 0abe4ec
commit 505fef8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Jms/YamlValidatorConverter.php b/src/Jms/YamlValidatorConverter.php
@@ -143,8 +143,17 @@ private function loadValidatorType(array &$property, Type $type, $arrayized = fa
                         break;
                     case 'pattern':
                         foreach ($check as $item) {
+                            // initial support for https://www.w3.org/TR/xsd-unicode-blocknames/
+                            // not supported by standard php regex implementation
+                            $regexPattern = strtr($item['value'], [
+                                '\p{IsBasicLatin}' => '\x00-\x7F',
+                                '\p{IsIsBasicLatin}' => '\x{0000}-\x{007F}',
+                                '\p{IsLatin-1Supplement}' => '\x{0080}-\x{00FF}',
+                                '\p{IsLatinExtended-A}' => '\x{0100}-\x{024F}',
+                                '\p{IsLatinExtended-B}' => '\x{0180}-\x{024F}',
+                            ]);
                             $rules[] = [
-                                'Regex' => ['pattern' => "~{$item['value']}~"],
+                                'Regex' => ['pattern' => "~{$regexPattern}~"],
                             ];
                         }
                         break;

diff --git a/tests/Converter/Validator/Xsd2ValidatorTest.php b/tests/Converter/Validator/Xsd2ValidatorTest.php
@@ -125,6 +125,17 @@ public function getRestrictionsValidations()
                 ],
             ],
             // pattern / Regex
+            [
+                '<xs:pattern value="[\\p{IsBasicLatin}\\p{IsLatin-1Supplement}]+"/>',
+                [
+                    [
+                        'Regex' => [
+                            'pattern' => '~[\\x00-\\x7F\\x{0080}-\\x{00FF}]+~',
+                            'groups' => ['xsd_rules'],
+                        ],
+                    ],
+                ],
+            ],
             [
                 '<xs:pattern value="\\([0-9]{2}\\)\\s[0-9]{4}-[0-9]{4,5}"/>',
                 [