Merge remote-tracking branch 'origin/2.6' into 2.7

Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Component/Validator/Constraints/EmailValidator.php
Merge branch '2.3' into 2.6
2026-03-24 17:22:11 +01:00 · 2015-06-25 12:52:11 +00:00 · 2015-06-25 13:21:15 +02:00 · 2015-06-21 22:11:32 +02:00 · 2015-06-18 21:21:56 +02:00 · 2015-06-08 10:37:21 +01:00
7 changed files with 5 additions and 12 deletions
--- a/ApcUniversalClassLoader.php
+++ b/ApcUniversalClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);

 /**
 * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);

 /**
 * Autoloader checking if the class is really defined in the file found.
--- a/DebugUniversalClassLoader.php
+++ b/DebugUniversalClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);

 /**
 * Checks that the class is actually declared in the included file.
--- a/Tests/ClassMapGeneratorTest.php
+++ b/Tests/ClassMapGeneratorTest.php
@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase

    public function prepare_workspace()
    {
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
+        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
        mkdir($this->workspace, 0777, true);
        $this->workspace = realpath($this->workspace);
    }
--- a/Tests/LegacyApcUniversalClassLoaderTest.php
+++ b/Tests/LegacyApcUniversalClassLoaderTest.php
@@ -20,8 +20,6 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
    protected function setUp()
    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
        if (!extension_loaded('apc')) {
            $this->markTestSkipped('The apc extension is not available.');
        }
--- a/Tests/LegacyUniversalClassLoaderTest.php
+++ b/Tests/LegacyUniversalClassLoaderTest.php
@@ -18,11 +18,6 @@ use Symfony\Component\ClassLoader\UniversalClassLoader;
 */
 class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
    /**
     * @dataProvider getLoadClassTests
     */
--- a/UniversalClassLoader.php
+++ b/UniversalClassLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);

 /**
 * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
Author	SHA1	Message	Date
Abdellatif Ait boudad	2fccbc5449	Merge remote-tracking branch 'origin/2.6' into 2.7 Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Component/Validator/Constraints/EmailValidator.php	2015-06-25 12:52:11 +00:00
Nicolas Grekas	c5311911ee	Merge branch '2.3' into 2.6 * 2.3: Fixed the regexp for the validator of Maestro-based credit/debit cards [Console] Fix STDERR output text on IBM iSeries OS400 [HttpFoundation] Use convention to allow throwing from __toString() [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern) [bugfix][MonologBridge] WebProcessor: passing to BaseWebProcessor [2.3] Static Code Analysis for Components [Translation][update cmd] taken account into bundle overrides path. Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php	2015-06-25 13:21:15 +02:00
Vladimir Reznichenko	82f4e6502e	[2.3] Static Code Analysis for Components	2015-06-21 22:11:32 +02:00
Nicolas Grekas	6f1b712e65	[PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy	2015-06-18 21:21:56 +02:00
reecefowell	84843730de	Silence invasive deprecation warnings, opt-in for warnings	2015-06-08 10:37:21 +01:00