Skip to content

Commit cc78f14

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: fix merge [VarDumper] Test intl formatter broken since dumper does not replace the nnbsp character by standard space [WebProfilerBundle] Fix intercept external redirects [Webhook] Added missing XML attribute in config XSD [String] Skip a test when an issue is detected in PCRE2 [ExpressionLanguage] Fix null coalescing propagation [Mailer] Stop using the (local) AWS shared configuration in the PHPUnit tests. detect colors on not windows fix xterm detection refactor: hyper check Missing translations for Slovak (sk) #51954 Remove redundant PHPdoc line properly handle SYMFONY_DOTENV_VARS being the empty string Avoid incompatibility with symfony/console 7 bug #45057 [Messenger] Avoid reconnecting active Redis connections. [HttpKernel] Catch `TypeError` if the wrong type is used in `BackedEnumValueResolver` [Serializer] fix regression where nullable int cannot be serialized do not overwrite an application's default serialization context
2 parents 92bd2bf + 7cb80bc commit cc78f14

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Tests/AbstractUnicodeTestCase.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,21 @@ public function testCodePointsAt(array $expected, string $string, int $offset, i
9292

9393
public static function provideCodePointsAt(): array
9494
{
95-
return [
95+
$data = [
9696
[[], '', 0],
9797
[[], 'a', 1],
9898
[[0x53], 'Späßchen', 0],
9999
[[0xE4], 'Späßchen', 2],
100100
[[0xDF], 'Späßchen', -5],
101-
[[0x260E], '☢☎❄', 1],
102101
];
102+
103+
// Skip this set if we encounter an issue in PCRE2
104+
// @see https://github.com/PCRE2Project/pcre2/issues/361
105+
if (3 === grapheme_strlen('☢☎❄')) {
106+
$data[] = [[0x260E], '☢☎❄', 1];
107+
}
108+
109+
return $data;
103110
}
104111

105112
public static function provideLength(): array

0 commit comments

Comments
 (0)