Merge branch '2.3' into 2.7

* 2.3: added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
added the new Composer exclude-from-classmap option
2026-03-25 01:32:09 +01:00 · 2015-10-30 13:10:21 -07:00 · 2015-10-30 12:48:51 -07:00 · 2015-10-11 11:39:48 +02:00 · 2015-10-11 11:37:49 +02:00 · 2015-10-10 11:26:25 +02:00
2 changed files with 4 additions and 6 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -21,8 +21,6 @@ namespace Symfony\Component\Debug;
 * @author Fabien Potencier <fabien@symfony.com>
 * @author Christophe Coevoet <stof@notk.org>
 * @author Nicolas Grekas <p@tchwork.com>
- *
- * @api
 */
 class DebugClassLoader
 {
@@ -38,8 +36,6 @@ class DebugClassLoader
     * Constructor.
     *
     * @param callable|object $classLoader Passing an object is @deprecated since version 2.5 and support for it will be removed in 3.0
-     *
-     * @api
     */
    public function __construct($classLoader)
    {
--- a/composer.json
+++ b/composer.json
@@ -23,12 +23,14 @@
        "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
    },
    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
        "symfony/class-loader": "~2.2",
        "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
    },
    "autoload": {
-        "psr-4": { "Symfony\\Component\\Debug\\": "" }
+        "psr-4": { "Symfony\\Component\\Debug\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
    },
    "minimum-stability": "dev",
    "extra": {
Author	SHA1	Message	Date
Fabien Potencier	0dbc119596	Merge branch '2.3' into 2.7 * 2.3: added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices	2015-10-30 13:10:21 -07:00
Anne-Sophie Bachelard	89e1a14dfd	added the new Composer exclude-from-classmap option	2015-10-30 12:48:51 -07:00
Nicolas Grekas	fb9e6887db	Merge branch '2.3' into 2.7 * 2.3: [ci] SymfonyTestsListener is now auto-registered adds validation messages missing italian translations	2015-10-11 11:39:48 +02:00
Nicolas Grekas	e1aa457a97	[ci] SymfonyTestsListener is now auto-registered	2015-10-11 11:37:49 +02:00
Nicolas Grekas	64e916c356	Merge branch '2.3' into 2.7 * 2.3: [tests] Use @requires annotation when possible [ci] Enable collecting and replaying skipped tests [Process] Workaround buggy PHP warning [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Conflicts: composer.json src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json	2015-10-10 11:26:25 +02:00
Nicolas Grekas	e9470b1f9e	[ci] Enable collecting and replaying skipped tests	2015-10-10 10:46:02 +02:00
Tobias Schultze	fc037263d5	remove api tags that are new in 2.7	2015-09-29 14:08:33 +02:00
Nicolas Grekas	77d632fd72	[php7] Fix for substr() always returning a string	2015-07-28 14:38:40 +02:00
Nicolas Grekas	20c5dad1af	Enhance hhvm test skip message	2015-07-03 07:54:45 +02:00
Nicolas Grekas	8f1257608f	Towards 100% HHVM compat	2015-06-30 15:39:12 +02:00
Nicolas Grekas	355f12cf08	[2.3][Debug] Fix fatal-errors handling on HHVM	2015-06-16 14:35:43 +02:00
Vladimir Reznichenko	ff6a582db5	Php Inspections (EA Extended): - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString -resolved implicit magic methods calls -resolved callable name case mismatches	2015-05-29 19:14:48 +02:00
Nicolas Grekas	30d1de52f1	Fix HTML escaping of to-source links	2015-05-19 17:44:44 -07:00