Merge branch '2.3' into 2.7

* 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
CS: general fixes
2026-04-24 01:08:03 +02:00 · 2015-12-05 18:37:09 +01:00 · 2015-12-01 23:08:33 +01:00 · 2015-11-26 08:00:48 +01:00 · 2015-11-25 18:16:22 +01:00 · 2015-11-18 09:19:46 +01:00
4 changed files with 8 additions and 5 deletions
@@ -137,8 +137,8 @@ class ClassCollectionLoader
    public static function fixNamespaceDeclarations($source)
    {
        if (!function_exists('token_get_all') || !self::$useTokenizer) {
-            if (preg_match('/namespace(.*?)\s*;/', $source)) {
-                $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n";
+            if (preg_match('/(^|\s)namespace(.*?)\s*;/', $source)) {
+                $source = preg_replace('/(^|\s)namespace(.*?)\s*;/', "$1namespace$2\n{", $source)."}\n";
            }

            return $source;
@@ -97,7 +97,7 @@ class ClassLoader
                    $paths
                ));
            } elseif (!in_array($paths, $this->prefixes[$prefix])) {
-                 $this->prefixes[$prefix][] = $paths;
+                $this->prefixes[$prefix][] = $paths;
            }
        } else {
            $this->prefixes[$prefix] = array_unique((array) $paths);
@@ -205,7 +205,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
            array("namespace   Bar ;\nclass Foo {}\n", "namespace   Bar\n{\nclass Foo {}\n}\n"),
            array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"),
            array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"),
-            array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"),
+            array("\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n", "\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n"),
        );
    }

@@ -23,7 +23,10 @@
        "symfony/finder": "~2.0,>=2.0.5"
    },
    "autoload": {
-        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
+        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
    },
    "extra": {
        "branch-alias": {
Author	SHA1	Message	Date
Christophe Coevoet	79a6743f40	Merge branch '2.3' into 2.7 * 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes	2015-12-05 18:37:09 +01:00
Dariusz Ruminski	c77176c94f	CS: general fixes	2015-12-01 23:08:33 +01:00
Nicolas Grekas	2db2a0e9d2	Merge branch '2.3' into 2.7 * 2.3: Always enable clock-mock for HttpFoundation [ClassLoader] Fix parsing namespace when token_get_all() is missing Bug #16343 [Router] Too many Routes ?	2015-11-26 08:00:48 +01:00
Nicolas Grekas	25d492fa74	[ClassLoader] Fix parsing namespace when token_get_all() is missing	2015-11-25 18:16:22 +01:00
Nicolas Grekas	bd1ffcea9c	Add missing exclusions from phpunit.xml.dist	2015-11-18 09:19:46 +01:00
Fabien Potencier	9d8359ca86	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	f0a379b040	added the new Composer exclude-from-classmap option	2015-10-30 12:48:51 -07:00