bug #16668 [ClassLoader] Fix parsing namespace when token_get_all() is missing (nicolas-grekas)

Tobion · Tobion · commit 27327d3e4d12 · 2015-11-25T20:26:50.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [ClassLoader] Fix parsing namespace when token_get_all() is missing | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14871 | License | MIT | Doc PR | - Commits ------- 4a17c9e [ClassLoader] Fix parsing namespace when token_get_all() is missing
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
     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;
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@@ -205,7 +205,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()
             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"),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =`
`137`	`137`	`public static function fixNamespaceDeclarations($source)`
`138`	`138`	`{`
`139`	`139`	`if (!function_exists('token_get_all') \|\| !self::$useTokenizer) {`
`140`		`- if (preg_match('/namespace(.?)\s;/', $source)) {`
`141`		`- $source = preg_replace('/namespace(.?)\s;/', "namespace$1\n{", $source)."}\n";`
	`140`	`+ if (preg_match('/(^\|\s)namespace(.?)\s;/', $source)) {`
	`141`	`+ $source = preg_replace('/(^\|\s)namespace(.?)\s;/', "$1namespace$2\n{", $source)."}\n";`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`return $source;`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()`
`205`	`205`	`array("namespace Bar ;\nclass Foo {}\n", "namespace Bar\n{\nclass Foo {}\n}\n"),`
`206`	`206`	`array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"),`
`207`	`207`	`array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"),`
`208`		`- array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"),`
	`208`	`+ array("\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n", "\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n"),`
`209`	`209`	`);`
`210`	`210`	`}`
`211`	`211`