Skip to content

Commit 13d76d0

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [String] Update wcswidth data with Unicode 15.1 [FrameworkBundle] no serializer mapping cache in debug mode without enable_annotations [Cache] fix using multiple Redis Sentinel hosts when the first one is not resolvable
2 parents 53d1a83 + e41bdc9 commit 13d76d0

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

Resources/WcswidthDataGenerator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private function writeWideWidthData(): void
4646

4747
$version = $matches[1];
4848

49-
if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))?;[W|F]/m', $content, $matches, \PREG_SET_ORDER)) {
49+
if (!preg_match_all('/^([A-H\d]{4,})(?:\.\.([A-H\d]{4,}))? +; [W|F]/m', $content, $matches, \PREG_SET_ORDER)) {
5050
throw new RuntimeException('The wide width pattern did not match anything.');
5151
}
5252

Resources/data/wcswidth_table_wide.php

+15-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/*
44
* This file has been auto-generated by the Symfony String Component for internal use.
55
*
6-
* Unicode version: 15.0.0
7-
* Date: 2022-10-05T17:16:36+02:00
6+
* Unicode version: 15.1.0
7+
* Date: 2023-09-13T11:47:12+00:00
88
*/
99

1010
return [
@@ -166,7 +166,7 @@
166166
],
167167
[
168168
12272,
169-
12283,
169+
12287,
170170
],
171171
[
172172
12288,
@@ -396,6 +396,10 @@
396396
12736,
397397
12771,
398398
],
399+
[
400+
12783,
401+
12783,
402+
],
399403
[
400404
12784,
401405
12799,
@@ -1110,6 +1114,14 @@
11101114
],
11111115
[
11121116
191457,
1117+
191471,
1118+
],
1119+
[
1120+
191472,
1121+
192093,
1122+
],
1123+
[
1124+
192094,
11131125
194559,
11141126
],
11151127
[

Resources/data/wcswidth_table_zero.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/*
44
* This file has been auto-generated by the Symfony String Component for internal use.
55
*
6-
* Unicode version: 15.0.0
7-
* Date: 2022-10-05T17:16:37+02:00
6+
* Unicode version: 15.1.0
7+
* Date: 2023-09-13T11:47:13+00:00
88
*/
99

1010
return [

0 commit comments

Comments
 (0)