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

Commit 4d4dec3

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [SecurityBundle] only pass relevant user provider [Intl] Make tests pass after the ICU data update [Intl] Update ICU data to 58.2 [DependencyInjection] removed dead code. [Yaml] Stop replacing NULLs when merging
2 parents d5d68c0 + eb750be commit 4d4dec3

File tree

973 files changed

+20801
-11425
lines changed

Some content is hidden

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

973 files changed

+20801
-11425
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,6 @@ private function createFirewalls($config, ContainerBuilder $container)
216216
$firewalls = $config['firewalls'];
217217
$providerIds = $this->createUserProviders($config, $container);
218218

219-
// make the ContextListener aware of the configured user providers
220-
$definition = $container->getDefinition('security.context_listener');
221-
$arguments = $definition->getArguments();
222-
$userProviders = array();
223-
foreach ($providerIds as $userProviderId) {
224-
$userProviders[] = new Reference($userProviderId);
225-
}
226-
$arguments[1] = $userProviders;
227-
$definition->setArguments($arguments);
228-
229219
// load firewall map
230220
$mapDef = $container->getDefinition('security.firewall.map');
231221
$map = $authenticationProviders = array();
@@ -290,7 +280,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
290280
$contextKey = $firewall['context'];
291281
}
292282

293-
$listeners[] = new Reference($this->createContextListener($container, $contextKey));
283+
$listeners[] = new Reference($this->createContextListener($container, $contextKey, $defaultProvider));
294284
}
295285

296286
// Logout listener
@@ -375,14 +365,15 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
375365
return array($matcher, $listeners, $exceptionListener);
376366
}
377367

378-
private function createContextListener($container, $contextKey)
368+
private function createContextListener($container, $contextKey, $providerId)
379369
{
380370
if (isset($this->contextListeners[$contextKey])) {
381371
return $this->contextListeners[$contextKey];
382372
}
383373

384374
$listenerId = 'security.context_listener.'.count($this->contextListeners);
385375
$listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.context_listener'));
376+
$listener->replaceArgument(1, array(new Reference($providerId)));
386377
$listener->replaceArgument(2, $contextKey);
387378

388379
return $this->contextListeners[$contextKey] = $listenerId;

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@ public static function setUpBeforeClass()
3434

3535
public function testDump()
3636
{
37-
$dumper = new PhpDumper($container = new ContainerBuilder());
37+
$dumper = new PhpDumper(new ContainerBuilder());
3838

3939
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services1.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
4040
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services1-1.php', $dumper->dump(array('class' => 'Container', 'base_class' => 'AbstractContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Dump')), '->dump() takes a class and a base_class options');
41-
42-
$container = new ContainerBuilder();
43-
new PhpDumper($container);
4441
}
4542

4643
public function testDumpOptimizationString()

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function setUp()
2424
parent::setUp();
2525

2626
// Since we test against "de_AT", we need the full implementation
27-
IntlTestHelper::requireFullIntl($this);
27+
IntlTestHelper::requireFullIntl($this, '57.1');
2828

2929
\Locale::setDefault('de_AT');
3030

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function testReverseTransform($to, $from, $locale)
228228
public function testReverseTransformWithGrouping($to, $from, $locale)
229229
{
230230
// Since we test against other locales, we need the full implementation
231-
IntlTestHelper::requireFullIntl($this, false);
231+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
232232

233233
\Locale::setDefault($locale);
234234

@@ -375,7 +375,7 @@ public function testReverseTransformDoesNotRoundIfNoScale()
375375
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
376376
{
377377
// Since we test against other locales, we need the full implementation
378-
IntlTestHelper::requireFullIntl($this, false);
378+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
379379

380380
\Locale::setDefault('fr');
381381
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -395,7 +395,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
395395
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
396396
{
397397
// Since we test against "de_DE", we need the full implementation
398-
IntlTestHelper::requireFullIntl($this, false);
398+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
399399

400400
\Locale::setDefault('de_DE');
401401

@@ -410,7 +410,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
410410
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
411411
{
412412
// Since we test against "de_DE", we need the full implementation
413-
IntlTestHelper::requireFullIntl($this, false);
413+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
414414

415415
\Locale::setDefault('de_DE');
416416

@@ -434,7 +434,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupin
434434
public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
435435
{
436436
// Since we test against other locales, we need the full implementation
437-
IntlTestHelper::requireFullIntl($this, false);
437+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
438438

439439
\Locale::setDefault('bg');
440440
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -453,6 +453,8 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
453453
*/
454454
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
455455
{
456+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
457+
456458
$transformer = new NumberToLocalizedStringTransformer(null, true);
457459

458460
$transformer->reverseTransform('1,234,5');
@@ -463,6 +465,8 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
463465
*/
464466
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
465467
{
468+
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
469+
466470
$transformer = new NumberToLocalizedStringTransformer(null, true);
467471

468472
$transformer->reverseTransform('1234,5');

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ public function testMonthsOption()
514514
public function testMonthsOptionShortFormat()
515515
{
516516
// we test against "de_AT", so we need the full implementation
517-
IntlTestHelper::requireFullIntl($this);
517+
IntlTestHelper::requireFullIntl($this, '57.1');
518518

519519
\Locale::setDefault('de_AT');
520520

‎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 '57.1';
237+
return '58.2';
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
@@ -13,3 +13,4 @@
1313
54 = http://source.icu-project.org/repos/icu/icu/tags/release-54-1/source
1414
55 = http://source.icu-project.org/repos/icu/icu/tags/release-55-1/source
1515
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
16+
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.22.93",
2+
"Version": "2.1.29.44",
33
"Names": {
44
"AED": [
55
"AED",
@@ -93,9 +93,13 @@
9393
"BWP",
9494
"Botswana pula"
9595
],
96+
"BYN": [
97+
"BYN",
98+
"Belo-Russiese roebel"
99+
],
96100
"BYR": [
97101
"BYR",
98-
"Belo-Russiese roebel"
102+
"Belo-Russiese roebel (2000–2016)"
99103
],
100104
"BZD": [
101105
"BZD",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"NAD": [
55
"$",

‎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.23.7",
2+
"Version": "2.1.27.40",
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,5 +1,5 @@
11
{
2-
"Version": "2.1.22.93",
2+
"Version": "2.1.28.79",
33
"Names": {
44
"AED": [
55
"AED",
@@ -93,9 +93,13 @@
9393
"BWP",
9494
"የቦትስዋና ፑላ"
9595
],
96+
"BYN": [
97+
"BYN",
98+
"የቤላሩስያ ሩብል"
99+
],
96100
"BYR": [
97101
"BYR",
98-
"የቤላሩስያ ሩብል"
102+
"የቤላሩስያ ሩብል (2000–2016)"
99103
],
100104
"BZD": [
101105
"BZD",
@@ -363,7 +367,7 @@
363367
],
364368
"MMK": [
365369
"MMK",
366-
"ምያንማ ክያት"
370+
"የማያናማር ክያት"
367371
],
368372
"MNT": [
369373
"MNT",
@@ -611,15 +615,15 @@
611615
],
612616
"XAF": [
613617
"FCFA",
614-
"ሴኤፍአ ፍራንክ ቤእአሴ"
618+
"የመካከለኛው አፍሪካ ሴፋ ፍራንክ"
615619
],
616620
"XCD": [
617621
"EC$",
618622
"የምዕራብ ካሪብያን ዶላር"
619623
],
620624
"XOF": [
621625
"CFA",
622-
"ሴኤፍአ ፍራንክ ቤሴእአኦ"
626+
"የምዕራብ አፍሪካ ሴፋ ፍራንክ"
623627
],
624628
"XPF": [
625629
"CFPF",

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.22.93",
2+
"Version": "2.1.28.79",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -173,9 +173,13 @@
173173
"BYB",
174174
"روبل بيلاروسي جديد - 1994-1999"
175175
],
176+
"BYN": [
177+
"BYN",
178+
"روبل بيلاروسي"
179+
],
176180
"BYR": [
177181
"BYR",
178-
"روبل بيلاروسي"
182+
"روبل بيلاروسي (٢٠٠٠–٢٠١٦)"
179183
],
180184
"BZD": [
181185
"BZD",
@@ -382,7 +386,7 @@
382386
"فورينت مجري"
383387
],
384388
"IDR": [
385-
"ر.إن.",
389+
"IDR",
386390
"روبية إندونيسية"
387391
],
388392
"IEP": [
@@ -399,7 +403,7 @@
399403
],
400404
"INR": [
401405
&qu B41A ot;₹",
402-
"روبيه هندي"
406+
"روبية هندي"
403407
],
404408
"IQD": [
405409
"د.ع.‏",
@@ -654,7 +658,7 @@
654658
"بيزو فلبيني"
655659
],
656660
"PKR": [
657-
"ر.ب.",
661+
"PKR",
658662
"روبية باكستاني"
659663
],
660664
"PLN": [
@@ -766,7 +770,7 @@
766770
"جلدر سورينامي"
767771
],
768772
"SSP": [
769-
"ج.ج.س.",
773+
"SSP",
770774
"جنيه جنوب السودان"
771775
],
772776
"STD": [
@@ -826,7 +830,7 @@
826830
"ليرة تركي"
827831
],
828832
"TRY": [
829-
"ل.ت.",
833+
"TRY",
830834
"ليرة تركية"
831835
],
832836
"TTD": [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"DJF": [
55
"Fdj",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"ERN": [
55
"Nfk",

‎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.19.14",
2+
"Version": "2.1.27.40",
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.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"SOS": [
55
"S",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"GBP": [
55
"GB£",

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.23.7",
2+
"Version": "2.1.28.79",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -189,9 +189,13 @@
189189
"BYB",
190190
"Belarus Yeni Rublu (1994–1999)"
191191
],
192+
"BYN": [
193+
"BYN",
194+
"Belarus Rublu"
195+
],
192196
"BYR": [
193197
"BYR",
194-
"Belarus Rublu"
198+
"Belarus Rublu (2000–2016)"
195199
],
196200
"BZD": [
197201
"BZD",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.19.14",
2+
"Version": "2.1.27.40",
33
"Names": {
44
"AZN": [
55
"₼",

0 commit comments

Comments
 (0)
0