bug #35049 [ProxyManager] fix generating proxies for root-namespaced classes (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 939d3bf1f357 · 2019-12-19T16:51:02.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [ProxyManager] fix generating proxies for root-namespaced classes | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34863 | License | MIT | Doc PR | - Commits ------- a47ae10 [ProxyManager] fix generating proxies for root-namespaced classes
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -97,6 +97,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =
     public function getProxyCode(Definition $definition)
     {
         $code = $this->classGenerator->generate($this->generateProxyClass($definition));
+        $code = preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);
 
         $code = preg_replace(
             '/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -21,5 +21,5 @@ class LazyServiceProjectServiceContainer extends Container
     }
 }
 
-class stdClass_%s extends %SstdClass implements \ProxyManager\%s
+class stdClass_%s extends \stdClass implements \ProxyManager\%s
 {%a}%A

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ public function getProxyFactoryCode(Definition $definition, $id, $factoryCode =`
`97`	`97`	`public function getProxyCode(Definition $definition)`
`98`	`98`	`{`
`99`	`99`	`$code = $this->classGenerator->generate($this->generateProxyClass($definition));`
	`100`	`+ $code = preg_replace('/^(class [^ ]++ extends )([^\\\\])/', '$1\\\\$2', $code);`
`100`	`101`
`101`	`102`	`$code = preg_replace(`
`102`	`103`	`'/(\$this->initializer[0-9a-f]++) && \1->__invoke\(\$this->(valueHolder[0-9a-f]++), (.*?), \1\);/',`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ class LazyServiceProjectServiceContainer extends Container`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-class stdClass_%s extends %SstdClass implements \ProxyManager\%s`
	`24`	`+class stdClass_%s extends \stdClass implements \ProxyManager\%s`
`25`	`25`	`{%a}%A`