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
[2.3] Static Code Analysis for Components
2026-03-24 17:22:11 +01:00 · 2015-06-25 13:21:15 +02:00 · 2015-06-21 22:11:32 +02:00
7 changed files with 9 additions and 21 deletions
--- a/ApcUniversalClassLoader.php
+++ b/ApcUniversalClassLoader.php
@@ -11,8 +11,6 @@

 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);
-
 /**
 * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
 *
@@ -62,8 +60,7 @@ namespace Symfony\Component\ClassLoader;
 *
 * @api
 *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link ClassLoader} class instead.
+ * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ApcClassLoader class instead.
 */
 class ApcUniversalClassLoader extends UniversalClassLoader
 {
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -11,8 +11,6 @@

 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);
-
 /**
 * Autoloader checking if the class is really defined in the file found.
 *
@@ -25,8 +23,7 @@ namespace Symfony\Component\ClassLoader;
 *
 * @api
 *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Debug\DebugClassLoader} instead.
+ * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
 */
 class DebugClassLoader
 {
--- a/DebugUniversalClassLoader.php
+++ b/DebugUniversalClassLoader.php
@@ -11,15 +11,12 @@

 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);
-
 /**
 * Checks that the class is actually declared in the included file.
 *
 * @author Fabien Potencier <fabien@symfony.com>
 *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link \Symfony\Component\Debug\DebugClassLoader} class instead.
+ * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the DebugClassLoader provided by the Debug component instead.
 */
 class DebugUniversalClassLoader extends UniversalClassLoader
 {
--- 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/UniversalClassLoader.php
+++ b/UniversalClassLoader.php
@@ -11,8 +11,6 @@

 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);
-
 /**
 * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
 *
@@ -60,8 +58,7 @@ namespace Symfony\Component\ClassLoader;
 *
 * @api
 *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link ClassLoader} class instead.
+ * @deprecated Deprecated since version 2.4, to be removed in 3.0. Use the ClassLoader class instead.
 */
 class UniversalClassLoader
 {
--- a/composer.json
+++ b/composer.json
@@ -17,18 +17,19 @@
    ],
    "minimum-stability": "dev",
    "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.3"
    },
    "require-dev": {
        "symfony/phpunit-bridge": "~2.7",
        "symfony/finder": "~2.0,>=2.0.5"
    },
    "autoload": {
-        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
+        "psr-0": { "Symfony\\Component\\ClassLoader\\": "" }
    },
+    "target-dir": "Symfony/Component/ClassLoader",
    "extra": {
        "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.6-dev"
        }
    }
 }
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,6 @@
    <php>
        <ini name="error_reporting" value="-1" />
    </php>
-
    <testsuites>
        <testsuite name="Symfony ClassLoader Component Test Suite">
            <directory>./Tests/</directory>