Merge branch '2.7'

* 2.7: [Hackday] - add trigger error for deprecated clases. [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. Add type aliases for allowed types in OptionsResolver [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations [Form] Add deprecation message for Form::bind() and Form::isBound() [Validator] add deprecation log (#12674) [Filesystem] Keep executable permission when a file is copied [HttpKernel] RouterListener uses "context" argument when logging route Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/Tests/AbstractLayoutTest.php src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php src/Symfony/Component/HttpKernel/CHANGELOG.md src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json
symfony · Jan 3, 2015 · 563f114 · 563f114
2 parents fae0674 + eb0dc82
commit 563f114
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+2.3.0
+-----
+
+The Locale component is deprecated since version 2.3 and will be removed in
+Symfony 3.0. You should use the more capable Intl component instead.
+
 2.1.0
 -----
 

diff --git a/Tests/LocaleTest.php b/Tests/LocaleTest.php
@@ -23,6 +23,8 @@ class LocaleTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         // Locale extends \Locale, so intl must be present
         IntlTestHelper::requireIntl($this);
     }

diff --git a/Tests/Stub/StubLocaleTest.php b/Tests/Stub/StubLocaleTest.php
@@ -21,9 +21,10 @@ class StubLocaleTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        IntlTestHelper::requireIntl($this);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
-        parent::setUp();
+        // Locale extends \Locale, so intl must be present
+        IntlTestHelper::requireIntl($this);
     }
 
     public function testGetCurrenciesData()