Skip to content

Commit a97632a

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: [DoctrineBridge] Fix auto mapping for bundles that contain only embeddables [String] Update wcswidth data with Unicode 15 [Messenger] Fix default serializer not handling DateTime objects properly
2 parents b1f92c2 + 7e7e0ff commit a97632a

File tree

2 files changed

+71
-23
lines changed

2 files changed

+71
-23
lines changed

Resources/data/wcswidth_table_wide.php

+28-20
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: 14.0.0
7-
* Date: 2021-09-17T09:20:30+02:00
6+
* Unicode version: 15.0.0
7+
* Date: 2022-10-05T17:16:36+02:00
88
*/
99

1010
return [
@@ -856,10 +856,18 @@
856856
110848,
857857
110882,
858858
],
859+
[
860+
110898,
861+
110898,
862+
],
859863
[
860864
110928,
861865
110930,
862866
],
867+
[
868+
110933,
869+
110933,
870+
],
863871
[
864872
110948,
865873
110951,
@@ -1005,7 +1013,7 @@
10051013
128727,
10061014
],
10071015
[
1008-
128733,
1016+
128732,
10091017
128735,
10101018
],
10111019
[
@@ -1038,39 +1046,31 @@
10381046
],
10391047
[
10401048
129648,
1041-
129652,
1042-
],
1043-
[
1044-
129656,
10451049
129660,
10461050
],
10471051
[
10481052
129664,
1049-
129670,
1053+
129672,
10501054
],
10511055
[
10521056
129680,
1053-
129708,
1054-
],
1055-
[
1056-
129712,
1057-
129722,
1057+
129725,
10581058
],
10591059
[
1060-
129728,
1060+
129727,
10611061
129733,
10621062
],
10631063
[
1064-
129744,
1065-
129753,
1064+
129742,
1065+
129755,
10661066
],
10671067
[
10681068
129760,
1069-
129767,
1069+
129768,
10701070
],
10711071
[
10721072
129776,
1073-
129782,
1073+
129784,
10741074
],
10751075
[
10761076
131072,
@@ -1082,10 +1082,10 @@
10821082
],
10831083
[
10841084
173824,
1085-
177976,
1085+
177977,
10861086
],
10871087
[
1088-
177977,
1088+
177978,
10891089
177983,
10901090
],
10911091
[
@@ -1130,6 +1130,14 @@
11301130
],
11311131
[
11321132
201547,
1133+
201551,
1134+
],
1135+
[
1136+
201552,
1137+
205743,
1138+
],
1139+
[
1140+
205744,
11331141
262141,
11341142
],
11351143
];

Resources/data/wcswidth_table_zero.php

+43-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: 14.0.0
7-
* Date: 2021-09-17T09:20:30+02:00
6+
* Unicode version: 15.0.0
7+
* Date: 2022-10-05T17:16:37+02:00
88
*/
99

1010
return [
@@ -382,7 +382,7 @@
382382
],
383383
[
384384
3784,
385-
3789,
385+
3790,
386386
],
387387
[
388388
3864,
@@ -920,6 +920,10 @@
920920
69291,
921921
69292,
922922
],
923+
[
924+
69373,
925+
69375,
926+
],
923927
[
924928
69446,
925929
69456,
@@ -1008,6 +1012,10 @@
10081012
70206,
10091013
70206,
10101014
],
1015+
[
1016+
70209,
1017+
70209,
1018+
],
10111019
[
10121020
70367,
10131021
70367,
@@ -1252,6 +1260,30 @@
12521260
73459,
12531261
73460,
12541262
],
1263+
[
1264+
73472,
1265+
73473,
1266+
],
1267+
[
1268+
73526,
1269+
73530,
1270+
],
1271+
[
1272+
73536,
1273+
73536,
1274+
],
1275+
[
1276+
73538,
1277+
73538,
1278+
],
1279+
[
1280+
78912,
1281+
78912,
1282+
],
1283+
[
1284+
78919,
1285+
78933,
1286+
],
12551287
[
12561288
92912,
12571289
92916,
@@ -1348,6 +1380,10 @@
13481380
122918,
13491381
122922,
13501382
],
1383+
[
1384+
123023,
1385+
123023,
1386+
],
13511387
[
13521388
123184,
13531389
123190,
@@ -1360,6 +1396,10 @@
13601396
123628,
13611397
123631,
13621398
],
1399+
[
1400+
124140,
1401+
124143,
1402+
],
13631403
[
13641404
125136,
13651405
125142,

0 commit comments

Comments
 (0)