symfony#17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features

Ocramius · fabpot · commit a8f1a10e9ec6 · 2016-02-28T17:27:42.000+01:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -119,8 +119,6 @@ private function getProxyClassName(Definition $definition)
     }
 
     /**
-     * @param Definition $definition
-     *
      * @return ClassGenerator
      */
     private function generateProxyClass(Definition $definition)
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper;
 
+use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\StaticProxyConstructor;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -49,8 +50,7 @@ public function testDumpContainerWithProxyService()
      */
     public function testDumpContainerWithProxyServiceWillShareProxies()
     {
-        // detecting ProxyManager v2
-        if (class_exists('ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\StaticProxyConstructor')) {
+        if (class_exists(StaticProxyConstructor::class)) { // detecting ProxyManager v2
             require_once __DIR__.'/../Fixtures/php/lazy_service_with_hints.php';
         } else {
             require_once __DIR__.'/../Fixtures/php/lazy_service.php';
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
@@ -38,10 +38,8 @@ public function __construct()
     public function getFooService($lazyLoad = true)
     {
         if ($lazyLoad) {
-            $container = $this;
-
             return $this->services['foo'] = new stdClass_c1d194250ee2e2b7d2eab8b8212368a8(
-                function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
+                function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {
                     $wrappedInstance = $this->getFooService(false);
 
                     $proxy->setProxyInitializer(null);

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,6 @@ private function getProxyClassName(Definition $definition)`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/**`
`122`		`- * @param Definition $definition`
`123`		`- *`
`124`	`122`	`* @return ClassGenerator`
`125`	`123`	`*/`
`126`	`124`	`private function generateProxyClass(Definition $definition)`