symfony · Seldaek · Jun 20, 2014 · Jun 22, 2014 · Nov 12, 2014 · Dec 7, 2014
diff --git a/composer.json b/composer.json
@@ -79,7 +79,7 @@
         "egulias/email-validator": "~1.2"
     },
     "autoload": {
-        "psr-0": { "Symfony\\": "src/" },
+        "psr-4": { "Symfony\\": "src/Symfony/" },
         "classmap": [
             "src/Symfony/Component/HttpFoundation/Resources/stubs",
             "src/Symfony/Component/Intl/Resources/stubs"

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -39,9 +39,8 @@
         "doctrine/orm": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Doctrine\\": "" }
+        "psr-4": { "Symfony\\Bridge\\Doctrine\\": "" }
     },
-    "target-dir": "Symfony/Bridge/Doctrine",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -30,9 +30,8 @@
         "symfony/event-dispatcher": "Needed when using log messages in console commands"
      },
     "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Monolog\\": "" }
+        "psr-4": { "Symfony\\Bridge\\Monolog\\": "" }
     },
-    "target-dir": "Symfony/Bridge/Monolog",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json
@@ -26,9 +26,8 @@
         "symfony/stopwatch": "~2.2"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Propel1\\": "" }
+        "psr-4": { "Symfony\\Bridge\\Propel1\\": "" }
     },
-    "target-dir": "Symfony/Bridge/Propel1",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -24,11 +24,8 @@
         "symfony/config": "2.3"
     },
     "autoload": {
-        "psr-0": {
-            "Symfony\\Bridge\\ProxyManager\\": ""
-        }
+        "psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" }
     },
-    "target-dir": "Symfony/Bridge/ProxyManager",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json
@@ -23,9 +23,8 @@
         "symfony/http-kernel": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Swiftmailer\\": "" }
+        "psr-4": { "Symfony\\Bridge\\Swiftmailer\\": "" }
     },
-    "target-dir": "Symfony/Bridge/Swiftmailer",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -48,9 +48,8 @@
         "symfony/expression-language": "For using the ExpressionExtension"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Twig\\": "" }
+        "psr-4": { "Symfony\\Bridge\\Twig\\": "" }
     },
-    "target-dir": "Symfony/Bridge/Twig",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -30,9 +30,8 @@
         "symfony/dependency-injection": "For using as a service from the container"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bundle\\DebugBundle\\": "" }
+        "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" }
     },
-    "target-dir": "Symfony/Bundle/DebugBundle",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -52,9 +52,8 @@
         "doctrine/cache": "For using alternative cache drivers"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bundle\\FrameworkBundle\\": "" }
+        "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" }
     },
-    "target-dir": "Symfony/Bundle/FrameworkBundle",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -33,9 +33,8 @@
         "doctrine/doctrine-bundle": "~1.2"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" }
+        "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" }
     },
-    "target-dir": "Symfony/Bundle/SecurityBundle",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -31,9 +31,8 @@
         "symfony/framework-bundle": "~2.1"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bundle\\TwigBundle\\": "" }
+        "psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" }
     },
-    "target-dir": "Symfony/Bundle/TwigBundle",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -28,9 +28,8 @@
         "symfony/stopwatch": "~2.2"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }
+        "psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }
     },
-    "target-dir": "Symfony/Bundle/WebProfilerBundle",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
@@ -27,9 +27,8 @@
         "symfony/process": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\BrowserKit\\": "" }
+        "psr-4": { "Symfony\\Component\\BrowserKit\\": "" }
     },
-    "target-dir": "Symfony/Component/BrowserKit",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
@@ -23,9 +23,8 @@
         "symfony/finder": "~2.0"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\ClassLoader\\": "" }
+        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
     },
-    "target-dir": "Symfony/Component/ClassLoader",
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev"

diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
@@ -20,9 +20,8 @@
         "symfony/filesystem": "~2.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Config\\": "" }
+        "psr-4": { "Symfony\\Component\\Config\\": "" }
     },
-    "target-dir": "Symfony/Component/Config",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -29,9 +29,8 @@
         "psr/log": "For using the console logger"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Console\\": "" }
+        "psr-4": { "Symfony\\Component\\Console\\": "" }
     },
-    "target-dir": "Symfony/Component/Console",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json
@@ -23,9 +23,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\CssSelector\\": "" }
+        "psr-4": { "Symfony\\Component\\CssSelector\\": "" }
     },
-    "target-dir": "Symfony/Component/CssSelector",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -117,9 +117,16 @@ private function getClassCandidates($class)
                     }
                 }
             }
+            if ($function[0] instanceof ComposerClassLoader) {
+                foreach ($function[0]->getPrefixesPsr4() as $prefix => $paths) {
+                    foreach ($paths as $path) {
+                        $classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));
+                    }
+                }
+            }
         }
 
-        return $classes;
+        return array_unique($classes);
     }
 
     /**

diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -13,9 +13,30 @@
 
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
+use Symfony\Component\Debug\DebugClassLoader;
+use Composer\Autoload\ClassLoader as ComposerClassLoader;
 
 class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        foreach (spl_autoload_functions() as $function) {
+            if (!is_array($function)) {
+                continue;
+            }
+
+            // get class loaders wrapped by DebugClassLoader
+            if ($function[0] instanceof DebugClassLoader) {
+                $function = $function[0]->getClassLoader();
+            }
+
+            if ($function[0] instanceof ComposerClassLoader) {
+                $function[0]->add('Symfony\Component\Debug\Tests\Fixtures', dirname(dirname(dirname(dirname(dirname(__DIR__))))));
+                break;
+            }
+        }
+    }
+
     /**
      * @dataProvider provideClassNotFoundData
      */

diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -28,9 +28,8 @@
         "symfony/http-kernel": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Debug\\": "" }
+        "psr-4": { "Symfony\\Component\\Debug\\": "" }
     },
-    "target-dir": "Symfony/Component/Debug",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -29,9 +29,8 @@
         "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\DependencyInjection\\": "" }
+        "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }
     },
-    "target-dir": "Symfony/Component/DependencyInjection",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
@@ -25,9 +25,8 @@
         "symfony/css-selector": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\DomCrawler\\": "" }
+        "psr-4": { "Symfony\\Component\\DomCrawler\\": "" }
     },
-    "target-dir": "Symfony/Component/DomCrawler",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
@@ -30,9 +30,8 @@
         "symfony/http-kernel": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" }
+        "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" }
     },
-    "target-dir": "Symfony/Component/EventDispatcher",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -19,9 +19,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\ExpressionLanguage\\": "" }
+        "psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" }
     },
-    "target-dir": "Symfony/Component/ExpressionLanguage",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
@@ -19,9 +19,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Filesystem\\": "" }
+        "psr-4": { "Symfony\\Component\\Filesystem\\": "" }
     },
-    "target-dir": "Symfony/Component/Filesystem",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json
@@ -19,9 +19,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Finder\\": "" }
+        "psr-4": { "Symfony\\Component\\Finder\\": "" }
     },
-    "target-dir": "Symfony/Component/Finder",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -36,9 +36,8 @@
         "symfony/framework-bundle": "For templating with PHP."
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Form\\": "" }
+        "psr-4": { "Symfony\\Component\\Form\\": "" }
     },
-    "target-dir": "Symfony/Component/Form",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
@@ -22,10 +22,9 @@
         "symfony/expression-language": "~2.4"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" },
-        "classmap": [ "Symfony/Component/HttpFoundation/Resources/stubs" ]
+        "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
+        "classmap": [ "Resources/stubs" ]
     },
-    "target-dir": "Symfony/Component/HttpFoundation",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -47,9 +47,8 @@
         "symfony/var-dumper": ""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\HttpKernel\\": "" }
+        "psr-4": { "Symfony\\Component\\HttpKernel\\": "" }
     },
-    "target-dir": "Symfony/Component/HttpKernel",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json
@@ -33,11 +33,10 @@
         "ext-intl": "to use the component with locales other than \"en\""
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Intl\\": "" },
-        "classmap": [ "Symfony/Component/Intl/Resources/stubs" ],
-        "files": [ "Symfony/Component/Intl/Resources/stubs/functions.php" ]
+        "psr-4": { "Symfony\\Component\\Intl\\": "" },
+        "classmap": [ "Resources/stubs" ],
+        "files": [ "Resources/stubs/functions.php" ]
     },
-    "target-dir": "Symfony/Component/Intl",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json
@@ -20,9 +20,8 @@
         "symfony/intl": ">=2.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Locale\\": "" }
+        "psr-4": { "Symfony\\Component\\Locale\\": "" }
     },
-    "target-dir": "Symfony/Component/Locale",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
@@ -19,9 +19,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\OptionsResolver\\": "" }
+        "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" }
     },
-    "target-dir": "Symfony/Component/OptionsResolver",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {

diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json
@@ -19,9 +19,8 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Process\\": "" }
+        "psr-4": { "Symfony\\Component\\Process\\": "" }
     },
-    "target-dir": "Symfony/Component/Process",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {