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

Author: fabpot

Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

@@ -24,7 +24,7 @@ protected function setUp()
         parent::setUp();
 
         // Since we test against "de_AT", we need the full implementation
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, '57.1');
 
         \Locale::setDefault('de_AT');
 

Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

@@ -228,7 +228,7 @@ public function testReverseTransform($to, $from, $locale)
     public function testReverseTransformWithGrouping($to, $from, $locale)
     {
         // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, false);
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
         \Locale::setDefault($locale);
 
@@ -375,7 +375,7 @@ public function testReverseTransformDoesNotRoundIfNoScale()
     public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
     {
         // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, false);
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
         \Locale::setDefault('fr');
         $transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -395,7 +395,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
     public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
     {
         // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, false);
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
         \Locale::setDefault('de_DE');
 
@@ -410,7 +410,7 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
     public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
     {
         // Since we test against "de_DE", we need the full implementation
-        IntlTestHelper::requireFullIntl($this, false);
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
         \Locale::setDefault('de_DE');
 
@@ -434,7 +434,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupin
     public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
     {
         // Since we test against other locales, we need the full implementation
-        IntlTestHelper::requireFullIntl($this, false);
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
 
         \Locale::setDefault('bg');
         $transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -453,6 +453,8 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
      */
     public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
     {
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
         $transformer = new NumberToLocalizedStringTransformer(null, true);
 
         $transformer->reverseTransform('1,234,5');
@@ -463,6 +465,8 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
      */
     public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
     {
+        IntlTestHelper::requireFullIntl($this, '4.8.1.1');
+
         $transformer = new NumberToLocalizedStringTransformer(null, true);
 
         $transformer->reverseTransform('1234,5');

Tests/Extension/Core/Type/DateTypeTest.php

@@ -514,7 +514,7 @@ public function testMonthsOption()
     public function testMonthsOptionShortFormat()
     {
         // we test against "de_AT", so we need the full implementation
-        IntlTestHelper::requireFullIntl($this);
+        IntlTestHelper::requireFullIntl($this, '57.1');
 
         \Locale::setDefault('de_AT');