From 4e859013807277d356a5daab2fe30e569b78dc33 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 20 Jun 2014 21:32:40 +0200 Subject: [PATCH 1/6] Use PSR-4 everywhere instead of PSR-0 --- composer.json | 16 ++++++++-------- src/Symfony/Bridge/Doctrine/composer.json | 3 +-- src/Symfony/Bridge/Monolog/composer.json | 3 +-- src/Symfony/Bridge/ProxyManager/composer.json | 5 +---- src/Symfony/Bridge/Swiftmailer/composer.json | 3 +-- src/Symfony/Bridge/Twig/composer.json | 3 +-- src/Symfony/Bundle/FrameworkBundle/composer.json | 3 +-- src/Symfony/Bundle/SecurityBundle/composer.json | 3 +-- src/Symfony/Bundle/TwigBundle/composer.json | 3 +-- .../Bundle/WebProfilerBundle/composer.json | 3 +-- src/Symfony/Component/BrowserKit/composer.json | 3 +-- src/Symfony/Component/ClassLoader/composer.json | 3 +-- src/Symfony/Component/Config/composer.json | 3 +-- src/Symfony/Component/Console/composer.json | 3 +-- src/Symfony/Component/CssSelector/composer.json | 3 +-- src/Symfony/Component/Debug/composer.json | 3 +-- .../Component/DependencyInjection/composer.json | 3 +-- src/Symfony/Component/DomCrawler/composer.json | 3 +-- .../Component/EventDispatcher/composer.json | 3 +-- .../Component/ExpressionLanguage/composer.json | 3 +-- src/Symfony/Component/Filesystem/composer.json | 3 +-- src/Symfony/Component/Finder/composer.json | 3 +-- src/Symfony/Component/Form/composer.json | 3 +-- .../Component/HttpFoundation/composer.json | 3 +-- src/Symfony/Component/HttpKernel/composer.json | 3 +-- src/Symfony/Component/Intl/composer.json | 3 +-- src/Symfony/Component/Locale/composer.json | 3 +-- .../Component/OptionsResolver/composer.json | 3 +-- src/Symfony/Component/Process/composer.json | 3 +-- .../Component/PropertyAccess/composer.json | 3 +-- src/Symfony/Component/Routing/composer.json | 3 +-- src/Symfony/Component/Security/Acl/composer.json | 3 +-- .../Component/Security/Core/composer.json | 3 +-- .../Component/Security/Csrf/composer.json | 3 +-- .../Component/Security/Http/composer.json | 3 +-- src/Symfony/Component/Security/composer.json | 3 +-- src/Symfony/Component/Serializer/composer.json | 3 +-- src/Symfony/Component/Stopwatch/composer.json | 3 +-- src/Symfony/Component/Templating/composer.json | 3 +-- src/Symfony/Component/Translation/composer.json | 3 +-- src/Symfony/Component/Validator/composer.json | 3 +-- src/Symfony/Component/Yaml/composer.json | 3 +-- 42 files changed, 49 insertions(+), 92 deletions(-) diff --git a/composer.json b/composer.json index 8d2c53be871a0..9a12a3926f47d 100644 --- a/composer.json +++ b/composer.json @@ -79,14 +79,14 @@ "egulias/email-validator": "~1.2" }, "autoload": { - "psr-0": { - "Symfony\\Bridge\\Doctrine\\": "src/", - "Symfony\\Bridge\\Monolog\\": "src/", - "Symfony\\Bridge\\ProxyManager\\": "src/", - "Symfony\\Bridge\\Swiftmailer\\": "src/", - "Symfony\\Bridge\\Twig\\": "src/", - "Symfony\\Bundle\\": "src/", - "Symfony\\Component\\": "src/" + "psr-4": { + "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", + "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", + "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", + "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 2037d6d0bd222..8b2ce6b8abbda 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -42,9 +42,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 index 939baf0644b47..633d7f81a9e74 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -31,9 +31,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/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index ea7e8aba97215..76c7994370cc5 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -25,11 +25,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 index 2d2bf35f24272..8a9c9d4772c0a 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -26,9 +26,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 index f27437fa73ca3..07d31b352b1ad 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -51,9 +51,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/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index c48c702268a1e..8f20770b694cc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -57,9 +57,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 index 00c70a6d2f304..39d85d280f0ca 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -41,9 +41,8 @@ "ircmaxell/password-compat": "~1.0" }, "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 index 0aed024910de6..f188616d0c9a5 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -33,9 +33,8 @@ "symfony/framework-bundle": "~2.7" }, "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 index 4db37bab1a78b..f295d65d102be 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -29,9 +29,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 index e5488e6ae76c2..a4f11d6efa52c 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -28,9 +28,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 index 519e2fa225986..760f373488c45 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -24,9 +24,8 @@ "symfony/finder": "~2.0,>=2.0.5" }, "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 index bd5409da664c4..83b93bd15347f 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -23,9 +23,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index 6f78399623ed7..a54bfd95ea116 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -30,9 +30,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 index 723b855fc34e4..767b140e40326 100644 --- a/src/Symfony/Component/CssSelector/composer.json +++ b/src/Symfony/Component/CssSelector/composer.json @@ -26,9 +26,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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/composer.json b/src/Symfony/Component/Debug/composer.json index 81aa1b3c6ca3b..36ebc2b3a8c7c 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -33,9 +33,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 index d0312ca3ec14a..21444afcc0c7f 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -33,9 +33,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 index ecb18a4e4f840..5f92524a0c16e 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -26,9 +26,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 index 8795917c3743b..6d419c65c9633 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -31,9 +31,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 index 42ff70ec9a2aa..4e897b88a84e9 100644 --- a/src/Symfony/Component/ExpressionLanguage/composer.json +++ b/src/Symfony/Component/ExpressionLanguage/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index 10c705b77f662..fbc4cb6028707 100644 --- a/src/Symfony/Component/Filesystem/composer.json +++ b/src/Symfony/Component/Filesystem/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index 68873e7a25f92..894a37cc664c2 100644 --- a/src/Symfony/Component/Finder/composer.json +++ b/src/Symfony/Component/Finder/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index c12ecc9d51bf6..81a4356f1e126 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -43,9 +43,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 index 348022a20c518..6a56183f86e30 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -23,10 +23,9 @@ "symfony/expression-language": "~2.4" }, "autoload": { - "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" }, + "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, "classmap": [ "Symfony/Component/HttpFoundation/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 index 268b2ee0c6642..0f42431d56b64 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -53,9 +53,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 index cdc61f159cf97..a229d795f7635 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -34,11 +34,10 @@ "ext-intl": "to use the component with locales other than \"en\"" }, "autoload": { - "psr-0": { "Symfony\\Component\\Intl\\": "" }, + "psr-4": { "Symfony\\Component\\Intl\\": "" }, "classmap": [ "Symfony/Component/Intl/Resources/stubs" ], "files": [ "Symfony/Component/Intl/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 index 290365a0f9dde..e58d517768be5 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -23,9 +23,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index 1852bda6fa5f6..56a98bdd0418a 100644 --- a/src/Symfony/Component/OptionsResolver/composer.json +++ b/src/Symfony/Component/OptionsResolver/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "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 index d6381528f27b3..49a1ac0b5043d 100644 --- a/src/Symfony/Component/Process/composer.json +++ b/src/Symfony/Component/Process/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "autoload": { - "psr-0": { "Symfony\\Component\\Process\\": "" } + "psr-4": { "Symfony\\Component\\Process\\": "" } }, - "target-dir": "Symfony/Component/Process", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json index 12a5e3c46ca7c..3744760fd1c05 100644 --- a/src/Symfony/Component/PropertyAccess/composer.json +++ b/src/Symfony/Component/PropertyAccess/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "autoload": { - "psr-0": { "Symfony\\Component\\PropertyAccess\\": "" } + "psr-4": { "Symfony\\Component\\PropertyAccess\\": "" } }, - "target-dir": "Symfony/Component/PropertyAccess", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 5672ddcd709e9..eff005bfa0887 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -38,9 +38,8 @@ "doctrine/annotations": "For using the annotation loader" }, "autoload": { - "psr-0": { "Symfony\\Component\\Routing\\": "" } + "psr-4": { "Symfony\\Component\\Routing\\": "" } }, - "target-dir": "Symfony/Component/Routing", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Security/Acl/composer.json b/src/Symfony/Component/Security/Acl/composer.json index feb666a998ced..256671cc99559 100644 --- a/src/Symfony/Component/Security/Acl/composer.json +++ b/src/Symfony/Component/Security/Acl/composer.json @@ -31,9 +31,8 @@ "doctrine/dbal": "For using the built-in ACL implementation" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Acl\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Acl\\": "" } }, - "target-dir": "Symfony/Component/Security/Acl", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index a9825c0fb8539..2b407dc58568c 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -36,9 +36,8 @@ "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Core\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Core\\": "" } }, - "target-dir": "Symfony/Component/Security/Core", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json index 88c39b2fe14d5..8a489ca0e3bb0 100644 --- a/src/Symfony/Component/Security/Csrf/composer.json +++ b/src/Symfony/Component/Security/Csrf/composer.json @@ -27,9 +27,8 @@ "symfony/http-foundation": "For using the class SessionTokenStorage." }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Csrf\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" } }, - "target-dir": "Symfony/Component/Security/Csrf", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index 4fa4f7685b80a..eb6aeda91f6e9 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -33,9 +33,8 @@ "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Http\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Http\\": "" } }, - "target-dir": "Symfony/Component/Security/Http", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 67fe8095b2ec5..1c016b1a2a1db 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -49,9 +49,8 @@ "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\": "" } + "psr-4": { "Symfony\\Component\\Security\\": "" } }, - "target-dir": "Symfony/Component/Security", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 110ea572e7f80..70290547fdc08 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -34,9 +34,8 @@ "symfony/property-access": "For using the ObjectNormalizer." }, "autoload": { - "psr-0": { "Symfony\\Component\\Serializer\\": "" } + "psr-4": { "Symfony\\Component\\Serializer\\": "" } }, - "target-dir": "Symfony/Component/Serializer", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json index b64081decee46..6a06e96106492 100644 --- a/src/Symfony/Component/Stopwatch/composer.json +++ b/src/Symfony/Component/Stopwatch/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "autoload": { - "psr-0": { "Symfony\\Component\\Stopwatch\\": "" } + "psr-4": { "Symfony\\Component\\Stopwatch\\": "" } }, - "target-dir": "Symfony/Component/Stopwatch", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json index e7370f4fc4e5e..e6b3e7c6bfe55 100644 --- a/src/Symfony/Component/Templating/composer.json +++ b/src/Symfony/Component/Templating/composer.json @@ -26,9 +26,8 @@ "psr/log": "For using debug logging in loaders" }, "autoload": { - "psr-0": { "Symfony\\Component\\Templating\\": "" } + "psr-4": { "Symfony\\Component\\Templating\\": "" } }, - "target-dir": "Symfony/Component/Templating", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 98c09984d3215..aff376629f939 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -34,9 +34,8 @@ "psr/log": "To use logging capability in translator" }, "autoload": { - "psr-0": { "Symfony\\Component\\Translation\\": "" } + "psr-4": { "Symfony\\Component\\Translation\\": "" } }, - "target-dir": "Symfony/Component/Translation", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index bd589db5c0d46..3dbfef20285db 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -43,9 +43,8 @@ "symfony/expression-language": "For using the 2.4 Expression validator" }, "autoload": { - "psr-0": { "Symfony\\Component\\Validator\\": "" } + "psr-4": { "Symfony\\Component\\Validator\\": "" } }, - "target-dir": "Symfony/Component/Validator", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 4a93aea67ab8b..45623ca186408 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -22,9 +22,8 @@ "symfony/phpunit-bridge": "~2.7" }, "autoload": { - "psr-0": { "Symfony\\Component\\Yaml\\": "" } + "psr-4": { "Symfony\\Component\\Yaml\\": "" } }, - "target-dir": "Symfony/Component/Yaml", "minimum-stability": "dev", "extra": { "branch-alias": { From 17f61afe0885a56c8128fb3d3bac1e209b4ba0e6 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 22 Jun 2014 15:11:53 +0200 Subject: [PATCH 2/6] Add psr-4 support to the ClassNotFoundFatalErrorHandler --- .../ClassNotFoundFatalErrorHandler.php | 7 +++++++ .../ClassNotFoundFatalErrorHandlerTest.php | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index 2af08597929d3..3df79d3c537c7 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -118,6 +118,13 @@ 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 array_unique($classes); diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php index 0c7631fc97ed0..783299b655a01 100644 --- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php +++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php @@ -15,9 +15,30 @@ use Symfony\Component\ClassLoader\UniversalClassLoader as SymfonyUniversalClassLoader; 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 */ From cc17234464c1dce4c1f3719357015170b8b0e39b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 12 Nov 2014 17:53:10 +0000 Subject: [PATCH 3/6] Add two more components to psr-4 --- src/Symfony/Bundle/DebugBundle/composer.json | 3 +-- src/Symfony/Component/VarDumper/composer.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json index ca55aba84c4bc..c122ae3a3dfbf 100644 --- a/src/Symfony/Bundle/DebugBundle/composer.json +++ b/src/Symfony/Bundle/DebugBundle/composer.json @@ -31,9 +31,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/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json index dbd0142201df0..d6f6b667d78a7 100644 --- a/src/Symfony/Component/VarDumper/composer.json +++ b/src/Symfony/Component/VarDumper/composer.json @@ -26,9 +26,8 @@ }, "autoload": { "files": [ "Resources/functions/dump.php" ], - "psr-0": { "Symfony\\Component\\VarDumper\\": "" } + "psr-4": { "Symfony\\Component\\VarDumper\\": "" } }, - "target-dir": "Symfony/Component/VarDumper", "minimum-stability": "dev", "extra": { "branch-alias": { From 60d4994e7029c78eb08bbd42671c059ffa9ebbd9 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 7 Dec 2014 17:26:22 +0000 Subject: [PATCH 4/6] Tweak classmap paths --- src/Symfony/Component/HttpFoundation/composer.json | 2 +- src/Symfony/Component/Intl/composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 6a56183f86e30..56afdb85c4a1b 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -24,7 +24,7 @@ }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ "Symfony/Component/HttpFoundation/Resources/stubs" ] + "classmap": [ "Resources/stubs" ] }, "minimum-stability": "dev", "extra": { diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index a229d795f7635..0597eaa95ac00 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -35,8 +35,8 @@ }, "autoload": { "psr-4": { "Symfony\\Component\\Intl\\": "" }, - "classmap": [ "Symfony/Component/Intl/Resources/stubs" ], - "files": [ "Symfony/Component/Intl/Resources/stubs/functions.php" ] + "classmap": [ "Resources/stubs" ], + "files": [ "Resources/stubs/functions.php" ] }, "minimum-stability": "dev", "extra": { From e2bbf074b527d829f2cdf6b5e5e2fe96648077fc Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 11 Apr 2015 23:43:46 +0200 Subject: [PATCH 5/6] add phpunit bridge to psr4 --- src/Symfony/Bridge/PhpUnit/composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json index ab50369917005..ff7af2eca1f81 100644 --- a/src/Symfony/Bridge/PhpUnit/composer.json +++ b/src/Symfony/Bridge/PhpUnit/composer.json @@ -23,9 +23,8 @@ }, "autoload": { "files": [ "bootstrap.php" ], - "psr-0": { "Symfony\\Bridge\\PhpUnit\\": "" } + "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" } }, - "target-dir": "Symfony/Bridge/PhpUnit", "minimum-stability": "dev", "extra": { "branch-alias": { From 8072213afe0813dec493ab0fd73f046eb2713c8f Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 12 Apr 2015 00:21:29 +0200 Subject: [PATCH 6/6] adjust phpdoc for class not found handler --- .../Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php index 3df79d3c537c7..c4871349fa2db 100644 --- a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php +++ b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php @@ -77,7 +77,7 @@ public function handleError(array $error, FatalErrorException $exception) /** * Tries to guess the full namespace for a given class name. * - * By default, it looks for PSR-0 classes registered via a Symfony or a Composer + * By default, it looks for PSR-0 and PSR-4 classes registered via a Symfony or a Composer * autoloader (that should cover all common cases). * * @param string $class A class name (without its namespace)