Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4:
  fix merge
  [Intl] Update ICU data from 74.1 to 75.1
  use DeprecatedCallableInfo for Twig callables if possible
  [Filesystem] Add a warning about `chown()` and `chgrp()` on Windows
  [String] Update wcswidth data with Unicode 16
  PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset
  Work around parse_url() bug
  [Ldap] Clean `ldap_connect()` call in `LdapTestCase`
  [HttpFoundation] Update links for X-Accel-Redirect and fail properly when X-Accel-Mapping is missing
  • Loading branch information
xabbuh committed Sep 15, 2024
2 parents 6cd670a + 9982f9e commit e78af56
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 17 deletions.
46 changes: 33 additions & 13 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.1.0
* Date: 2023-09-13T11:47:12+00:00
* Unicode version: 16.0.0
* Date: 2024-09-11T08:21:22+00:00
*/

return [
Expand Down Expand Up @@ -44,6 +44,10 @@
9748,
9749,
],
[
9776,
9783,
],
[
9800,
9811,
Expand All @@ -52,6 +56,10 @@
9855,
9855,
],
[
9866,
9871,
],
[
9875,
9875,
Expand Down Expand Up @@ -394,7 +402,7 @@
],
[
12736,
12771,
12773,
],
[
12783,
Expand Down Expand Up @@ -452,6 +460,10 @@
13312,
19903,
],
[
19904,
19967,
],
[
19968,
40959,
Expand Down Expand Up @@ -836,6 +848,10 @@
101120,
101589,
],
[
101631,
101631,
],
[
101632,
101640,
Expand Down Expand Up @@ -880,6 +896,14 @@
110960,
111355,
],
[
119552,
119638,
],
[
119648,
119670,
],
[
126980,
126980,
Expand Down Expand Up @@ -1054,23 +1078,19 @@
],
[
129664,
129672,
],
[
129680,
129725,
129673,
],
[
129727,
129733,
129679,
129734,
],
[
129742,
129755,
129756,
],
[
129760,
129768,
129759,
129769,
],
[
129776,
Expand Down
52 changes: 48 additions & 4 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.1.0
* Date: 2023-09-13T11:47:13+00:00
* Unicode version: 16.0.0
* Date: 2024-09-11T08:21:22+00:00
*/

return [
Expand Down Expand Up @@ -109,7 +109,7 @@
2139,
],
[
2200,
2199,
2207,
],
[
Expand Down Expand Up @@ -916,12 +916,16 @@
68900,
68903,
],
[
68969,
68973,
],
[
69291,
69292,
],
[
69373,
69372,
69375,
],
[
Expand Down Expand Up @@ -1044,6 +1048,26 @@
70512,
70516,
],
[
70587,
70592,
],
[
70606,
70606,
],
[
70608,
70608,
],
[
70610,
70610,
],
[
70625,
70626,
],
[
70712,
70719,
Expand Down Expand Up @@ -1122,6 +1146,10 @@
],
[
71453,
71453,
],
[
71455,
71455,
],
[
Expand Down Expand Up @@ -1276,6 +1304,10 @@
73538,
73538,
],
[
73562,
73562,
],
[
78912,
78912,
Expand All @@ -1284,6 +1316,14 @@
78919,
78933,
],
[
90398,
90409,
],
[
90413,
90415,
],
[
92912,
92916,
Expand Down Expand Up @@ -1400,6 +1440,10 @@
124140,
124143,
],
[
124398,
124399,
],
[
125136,
125142,
Expand Down

0 comments on commit e78af56

Please sign in to comment.