Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
derrabus committed Sep 18, 2023
2 parents 53d1a83 + e41bdc9 commit 13d76d0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Resources/WcswidthDataGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private function writeWideWidthData(): void

$version = $matches[1];

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

Expand Down
18 changes: 15 additions & 3 deletions Resources/data/wcswidth_table_wide.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/*
* This file has been auto-generated by the Symfony String Component for internal use.
*
* Unicode version: 15.0.0
* Date: 2022-10-05T17:16:36+02:00
* Unicode version: 15.1.0
* Date: 2023-09-13T11:47:12+00:00
*/

return [
Expand Down Expand Up @@ -166,7 +166,7 @@
],
[
12272,
12283,
12287,
],
[
12288,
Expand Down Expand Up @@ -396,6 +396,10 @@
12736,
12771,
],
[
12783,
12783,
],
[
12784,
12799,
Expand Down Expand Up @@ -1110,6 +1114,14 @@
],
[
191457,
191471,
],
[
191472,
192093,
],
[
192094,
194559,
],
[
Expand Down
4 changes: 2 additions & 2 deletions Resources/data/wcswidth_table_zero.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/*
* This file has been auto-generated by the Symfony String Component for internal use.
*
* Unicode version: 15.0.0
* Date: 2022-10-05T17:16:37+02:00
* Unicode version: 15.1.0
* Date: 2023-09-13T11:47:13+00:00
*/

return [
Expand Down

0 comments on commit 13d76d0

Please sign in to comment.