|
@@ -34,8 +34,7 @@ discard block |
|
|
block discarded – undo |
|
34
|
34
|
$allowed = '\x{002D}\x{005F}'; |
|
35
|
35
|
$allowedNotSafe = '\x{0020}'; |
|
36
|
36
|
|
|
37
|
|
- $regex = $strict ? "/[^{$globally}{$allowed}]+/u" : |
|
38
|
|
- "/[^{$globally}{$globallyNotSafe}{$allowed}{$allowedNotSafe}]+/u"; |
|
|
37
|
+ $regex = $strict ? "/[^{$globally}{$allowed}]+/u" : "/[^{$globally}{$globallyNotSafe}{$allowed}{$allowedNotSafe}]+/u"; |
|
39
|
38
|
|
|
40
|
39
|
PHPUnit::assertNotRegExp( |
|
41
|
40
|
$regex, |
|
@@ -43,8 +42,7 @@ discard block |
|
|
block discarded – undo |
|
43
|
42
|
Messages::MEMBER_NAME_HAVE_RESERVED_CHARACTERS |
|
44
|
43
|
); |
|
45
|
44
|
|
|
46
|
|
- $regex = $strict ? "/^[{$globally}]{1}(?:.*[{$globally}]{1})?$/u" : |
|
47
|
|
- "/^[{$globally}{$globallyNotSafe}]{1}(?:.*[{$globally}{$globallyNotSafe}]{1})?$/u"; |
|
|
45
|
+ $regex = $strict ? "/^[{$globally}]{1}(?:.*[{$globally}]{1})?$/u" : "/^[{$globally}{$globallyNotSafe}]{1}(?:.*[{$globally}{$globallyNotSafe}]{1})?$/u"; |
|
48
|
46
|
PHPUnit::assertRegExp( |
|
49
|
47
|
$regex, |
|
50
|
48
|
$name, |
Please login to merge, or discard this patch.