unicode is a range

goetas-webservices · Aug 30, 2023 · 726686d · 726686d
1 parent 505fef8
commit 726686d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Jms/YamlValidatorConverter.php b/src/Jms/YamlValidatorConverter.php
@@ -146,11 +146,11 @@ private function loadValidatorType(array &$property, Type $type, $arrayized = fa
                             // 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}',
+                                '\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' => "~{$regexPattern}~"],

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