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-03-24 17:22:11 +01: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
3 changed files with 4 additions and 4 deletions
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -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;
--- a/ClassLoader.php
+++ b/ClassLoader.php
@@ -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);
--- a/Tests/ClassCollectionLoaderTest.php
+++ b/Tests/ClassCollectionLoaderTest.php
@@ -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"),
        );
    }
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