Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit afff0ce

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '3.2'
* 3.2: [SecurityBundle] only pass relevant user provider [Intl] Make tests pass after the ICU data update [Intl] Update ICU data to 58.2 do not register the test listener twice [DependencyInjection] removed dead code. [Yaml] Stop replacing NULLs when merging [WebServerBundle] fixed html attribute escape
2 parents 77f7a47 + 65b7d43 commit afff0ce
Copy full SHA for afff0ce

File tree

975 files changed

+20810
-11428
lines changed
Filter options

Some content is hidden

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

975 files changed

+20810
-11428
lines changed

‎src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
+9-2Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,16 @@ class TestRunner extends BaseRunner
3232
*/
3333
protected function handleConfiguration(array &$arguments)
3434
{
35+
$listener = new SymfonyTestsListener();
36+
37+
$result = parent::handleConfiguration($arguments);
38+
3539
$arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
36-
$arguments['listeners'][] = new SymfonyTestsListener();
3740

38-
return parent::handleConfiguration($arguments);
41+
if (!array_filter($arguments['listeners'], function ($listener) { return $listener instanceof SymfonyTestsListener; })) {
42+
$arguments['listeners'][] = $listener;
43+
}
44+
45+
return $result;
3946
}
4047
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+3-12Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,6 @@ private function createFirewalls($config, ContainerBuilder $container)
234234
$firewalls = $config['firewalls'];
235235
$providerIds = $this->createUserProviders($config, $container);
236236

237-
// make the ContextListener aware of the configured user providers
238-
$definition = $container->getDefinition('security.context_listener');
239-
$arguments = $definition->getArguments();
240-
$userProviders = array();
241-
foreach ($providerIds as $userProviderId) {
242-
$userProviders[] = new Reference($userProviderId);
243-
}
244-
$arguments[1] = $userProviders;
245-
$definition->setArguments($arguments);
246-
247237
// load firewall map
248238
$mapDef = $container->getDefinition('security.firewall.map');
249239
$map = $authenticationProviders = $contextRefs = array();
@@ -327,7 +317,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
327317
$contextKey = $firewall['context'];
328318
}
329319

330-
$listeners[] = new Reference($this->createContextListener($container, $contextKey));
320+
$listeners[] = new Reference($this->createContextListener($container, $contextKey, $defaultProvider));
331321
}
332322

333323
$config->replaceArgument(6, $contextKey);
@@ -436,14 +426,15 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
436426
return array($matcher, $listeners, $exceptionListener);
437427
}
438428

439-
private function createContextListener($container, $contextKey)
429+
private function createContextListener($container, $contextKey, $providerId)
440430
{
441431
if (isset($this->contextListeners[$contextKey])) {
442432
return $this->contextListeners[$contextKey];
443433
}
444434

445435
$listenerId = 'security.context_listener.'.count($this->contextListeners);
446436
$listener = $container->setDefinition($listenerId, new ChildDefinition('security.context_listener'));
437+
$listener->replaceArgument(1, array(new Reference($providerId)));
447438
$listener->replaceArgument(2, $contextKey);
448439

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

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="sf-toolbar-block sf-toolbar-block-{{ name }} sf-toolbar-status-{{ status|default('normal') }} {{ additional_classes|default('') }}" {{ block_attrs|default('') }}>
1+
<div class="sf-toolbar-block sf-toolbar-block-{{ name }} sf-toolbar-status-{{ status|default('normal') }} {{ additional_classes|default('') }}" {{ block_attrs|default('')|raw }}>
22
{% if link is not defined or link %}<a href="{{ path('_profiler', { token: token, panel: name }) }}">{% endif %}
33
<div class="sf-toolbar-icon">{{ icon|default('') }}</div>
44
{% if link|default(false) %}</a>{% endif %}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ public function testDump()
4747

4848
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services1.php', $dumper->dump(), '->dump() dumps an empty container as an empty PHP class');
4949
$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');
50-
51-
$container = new ContainerBuilder();
52-
$container->compile();
53-
new PhpDumper($container);
5450
}
5551

5652
public function testDumpOptimizationString()

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+9-5Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public function testMonthsOption()
504504
public function testMonthsOptionShortFormat()
505505
{
506506
// we test against "de_AT", so we need the full implementation
507-
IntlTestHelper::requireFullIntl($this);
507+
IntlTestHelper::requireFullIntl($this, '57.1');
508508

509509
\Locale::setDefault('de_AT');
510510

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Intl.php
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/bin/icu.ini
+1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/af.json
+6-2Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ak.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/am.json
+9-5Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar.json
+11-7Lines 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
"₹",
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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json
+1-1Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/az.json
+6-2Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json
+1-1Lines 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)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.