8000 Merge branch '2.8' into 3.3 · symfony/symfony@e720124 · GitHub
[go: up one dir, main page]
Skip to content

Commit e720124

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.3
* 2.8: [Intl] Update ICU data to 60.1 [Validator] Fix Costa Rica IBAN format [Bridge/ProxyManager] Remove direct reference to value holder property [Validator] Add Belarus IBAN format [FrameworkBundle] Specifically inject the debug dispatcher in the collector update the pull request template [Stopwatch] minor fix
2 parents 35f300d + e6087d6 commit e720124

File tree

830 files changed

+16072
-7342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

830 files changed

+16072
-7342
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 3.4 or master / 2.7, 2.8 or 3.3 <!-- see comment below -->
3+
| Branch? | master / 2.7, 2.8, 3.3, or 3.4 <!-- see comment below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
@@ -13,8 +13,7 @@
1313
<!--
1414
- Bug fixes must be submitted against the lowest branch where they apply
1515
(lowest branches are regularly merged to upper ones so they get the fixes too).
16-
- Features and deprecations must be submitted against the 3.4,
17-
legacy code removals go to the master branch.
16+
- Features and deprecations must be submitted against the master branch.
1817
- Please fill in this template according to the PR you're about to submit.
1918
- Replace this comment by a description of what your PR is solving.
2019
-->

‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy)
9696
*/
9797
public function getProxyCode(Definition $definition)
9898
{
99-
return $this->classGenerator->generate($this->generateProxyClass($definition));
99+
return preg_replace(
100+
'/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',
101+
'$1 && ($1->__invoke(\$$2, $3, $1) || 1) && $this->$2 = \$$2;',
102+
$this->classGenerator->generate($this->generateProxyClass($definition))
103+
);
100104
}
101105

102106
/**

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector">
2929
<tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="290" />
30-
<argument type="service" id="event_dispatcher" on-invalid="ignore" />
30+
<argument type="service" id="debug.event_dispatcher" on-invalid="ignore" />
3131
</service>
3232

3333
<service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector">

‎src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static function getIcuDataVersion()
234234
*/
235235
public static function getIcuStubVersion()
236236
{
237-
return '58.2';
237+
return '60.1';
238238
}
239239

240240
/**

‎src/Symfony/Component/Intl/Resources/bin/icu.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
1616
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
1717
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
18+
60 = http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source

‎src/Symfony/Component/Intl/Resources/data/currencies/af.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.32.59",
2+
"Version": "2.1.37.5",
33
"Names": {
44
"AED": [
55
"AED",
@@ -121,6 +121,10 @@
121121
"CLP",
122122
"Chileense peso"
123123
],
124+
"CNH": [
125+
"CNH",
126+
"Chinese joean"
127+
],
124128
"CNY": [
125129
"CN¥",
126130
"Sjinese joean renminbi"

‎src/Symfony/Component/Intl/Resources/data/currencies/ak.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.37.1",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/am.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Version": "2.1.32.59",
2+
"Version": "2.1.37.5",
33
"Names": {
44
"AED": [
55
"AED",
6-
"የተባበሩት የአረብ ኤምረትስ ዲርሀም"
6+
"የተባበሩት የአረብ ኤምሬትስ ድርሀም"
77
],
88
"AFN": [
99
"AFN",
@@ -121,6 +121,10 @@
121121
"CLP",
122122
"የቺሊ ፔሶ"
123123
],
124+
"CNH": [
125+
"የቻይና ዩዋን",
126+
"የቻይና ዩዋን (የውጭ ምንዛሪ)"
127+
],
124128
"CNY": [
125129
"CN¥",
126130
"የቻይና የን"
@@ -235,15 +239,15 @@
235239
],
236240
"HRK": [
237241
"HRK",
238-< 17AE /span>
"የክሮሽያ ኩና"
242+
"HRK"
239243
],
240244
"HTG": [
241245
"HTG",
242246
"የሃያቲ ጓርዴ"
243247
],
244248
"HUF": [
245249
"HUF",
246-
"የሁንጋሪ ፎሪንት"
250+
"የሃንጋሪያን ፎሪንት"
247251
],
248252
"IDR": [
249253
"IDR",
@@ -531,7 +535,7 @@
531535
],
532536
"STD": [
533537
"STD",
534-
"የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ"
538+
"የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ"
535539
],
536540
"SYP": [
537541
"SYP",

‎src/Symfony/Component/Intl/Resources/data/currencies/ar.json

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.32.86",
2+
"Version": "2.1.36.86",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -31,7 +31,7 @@
3131
],
3232
"AOA": [
3333
"AOA",
34-
"كوانزا أنجولي"
34+
"كوانزا أنغولي"
3535
],
3636
"AOK": [
3737
"AOK",
@@ -91,7 +91,7 @@
9191
],
9292
"BDT": [
9393
"BDT",
94-
"تاكا بنجلاديشي"
94+
"تاكا بنغلاديشي"
9595
],
9696
"BEC": [
9797
"BEC",
@@ -199,7 +199,11 @@
199199
],
200200
"CLP": [
201201
"CLP",
202-
"بيزو شيلي"
202+
"بيزو تشيلي"
203+
],
204+
"CNH": [
205+
"CNH",
206+
"يوان صيني (في الخارج)"
203207
],
204208
"CNY": [
205209
"CN¥",
@@ -211,7 +215,7 @@
211215
],
212216
"CRC": [
213217
"CRC",
214-
"كولن كوستا ريكي"
218+
"كولن كوستاريكي"
215219
],
216220
"CSD": [
217221
"CSD",
@@ -255,7 +259,7 @@
255259
],
256260
"DKK": [
257261
"DKK",
258-
"كرونة دانماركي"
262+
"كرونة دنماركية"
259263
],
260264
"DOP": [
261265
"DOP",
@@ -327,7 +331,7 @@
327331
],
328332
"GMD": [
329333
"GMD",
330-
"دلاسي جامبي"
334+
"دلاسي غامبي"
331335
],
332336
"GNF": [
333337
"GNF",
@@ -347,7 +351,7 @@
347351
],
348352
"GTQ": [
349353
"GTQ",
350-
"كوتزال جواتيمالا"
354+
"كوتزال غواتيمالا"
351355
],
352356
"GWE": [
353357
"GWE",
@@ -383,7 +387,7 @@
383387
],
384388
"HUF": [
385389
"HUF",
386-
"فورينت مجري"
390+
"فورينت هنغاري"
387391
],
388392
"IDR": [
389393
"IDR",
@@ -415,7 +419,7 @@
415419
],
416420
"ISK": [
417421
"ISK",
418-
"كرونه أيسلندي"
422+
"كرونة أيسلندية"
419423
],
420424
"ITL": [
421425
"ITL",
@@ -446,7 +450,7 @@
446450
"رييال كمبودي"
447451
],
448452
"KMF": [
449-
"ف.ج.ق.‏",
453+
"KMF",
450454
"فرنك جزر القمر"
451455
],
452456
"KPW": [
@@ -647,7 +651,7 @@
647651
],
648652
"PEN": [
649653
"PEN",
650-
"سول البيرو"
654+
"سول بيروفي"
651655
],
652656
"PGK": [
653657
"PGK",
@@ -675,7 +679,7 @@
675679
],
676680
"PYG": [
677681
"PYG",
678-
"جواراني باراجواي"
682+
"غواراني باراغواي"
679683
],
680684
"QAR": [
681685
"ر.ق.‏",
@@ -835,7 +839,7 @@
835839
],
836840
"TTD": [
837841
"TTD",
838-
"دولار ترينداد وتوباجو"
842+
"دولار ترينداد وتوباغو"
839843
],
840844
"TWD": [
841845
"NT$",

‎src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Version": "2.1.35.71",
3+
"Names": {
4+
"KMF": [
5+
"CF",
6+
"فرنك جزر القمر"
7+
]
8+
}
9+
}

‎src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.37.1",
33
"Names": {
44
"SDG": [
55
"SDG",

‎src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.31.33",
2+
"Version": "2.1.37.1",
33
"Names": {
44
"SOS": [
55
"S",

0 commit comments

Comments
 (0)
0