Skip to content

Commit 6c9e110

Browse files
Merge branch '7.4' into 8.0
* 7.4: [Messenger] Fix merge [Workflow] Fix swapped workflow/transition names in WorkflowValidator fix merge [DependencyInjection] Fix stale binding lookup in ResolveBindingsPass error message fix: correct romanian translations and add missing paucal forms [Cache] Fix DSN auth not passed to Redis/RedisCluster/Relay in RedisTrait [Cache] Fix DSN auth not passed to Redis/RedisCluster/Relay in RedisTrait skip a test case that doesn't work with PCRE < 10.40 sync ICU stub version do not use PHPUnit mock objects without configured expectations [WebProfilerBundle] Fix EventSource is missing static properties [FrameworkBundle] express that raw strings are mapped to senders for messenger routing [Asset] Fix JsonManifestVersionStrategy exception on missing manifest in non-strict mode [Yaml] Fix parsing nested mappings in sequences
2 parents 333ed85 + 9f20923 commit 6c9e110

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

Tests/AbstractUnicodeTestCase.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,22 @@ abstract class AbstractUnicodeTestCase extends AbstractAsciiTestCase
1919
{
2020
public static function provideWidth(): array
2121
{
22-
return array_merge(
23-
parent::provideWidth(),
24-
[
25-
[1, ''],
26-
[2, '⚠️'],
27-
[2, '1️⃣'],
28-
[14, '<<<END
22+
$unicodeWidthTests = [
23+
[1, ''],
24+
[2, '⚠️'],
25+
[14, '<<<END
2926
This is a
3027
multiline text
3128
END'],
32-
]
29+
];
30+
31+
if (\PCRE_VERSION_MAJOR > 10 || \PCRE_VERSION_MAJOR === 10 && \PCRE_VERSION_MINOR >= 40) {
32+
$unicodeWidthTests[] = [2, '1️⃣'];
33+
}
34+
35+
return array_merge(
36+
parent::provideWidth(),
37+
$unicodeWidthTests
3338
);
3439
}
3540

0 commit comments

Comments
 (0)