merged branch jeremylivingston/proxy-init (PR #8877)

fabpot · fabpot · commit 70db3c31821a · 2013-08-29T07:26:51.000+02:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8877). Discussion ---------- Clear lazy loading initializer after the service is successfully initialized Fixes #8875 Commits ------- da73102 Clear lazy loading initializer after the service is successfully initialized
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
@@ -51,10 +51,10 @@ public function instantiateProxy(ContainerInterface $container, Definition $defi
         return $this->factory->createProxy(
             $definition->getClass(),
             function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($realInstantiator) {
-                $proxy->setProxyInitializer(null);
-
                 $wrappedInstance = call_user_func($realInstantiator);
 
+                $proxy->setProxyInitializer(null);
+
                 return true;
             }
         );
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -75,10 +75,10 @@ public function getProxyFactoryCode(Definition $definition, $id)
 
             $instantiation new $proxyClass(
                 function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$container) {
-                    \$proxy->setProxyInitializer(null);
-
                     \$wrappedInstance = \$container->$methodName(false);
 
+                    \$proxy->setProxyInitializer(null);
+
                     return true;
                 }
             );
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -50,10 +50,10 @@ public function getFooService($lazyLoad = true)
 
             return $this->services['foo'] = new stdClass_c1d194250ee2e2b7d2eab8b8212368a8(
                 function (& $wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
-                    $proxy->setProxyInitializer(null);
-
                     $wrappedInstance = $container->getFooService(false);
 
+                    $proxy->setProxyInitializer(null);
+
                     return true;
                 }
             );
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
@@ -10,10 +10,10 @@ class ProjectServiceContainer extends Container
 
             return $this->services['foo'] = new stdClass_%s(
                 function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
-                    $proxy->setProxyInitializer(null);
-
                     $wrappedInstance = $container->getFooService(false);
 
+                    $proxy->setProxyInitializer(null);
+
                     return true;
                 }
             );
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -74,7 +74,7 @@ public function testGetProxyFactoryCode()
             '%wif ($lazyLoad) {%w$container = $this;%wreturn $this->services[\'foo\'] = new '
             . 'SymfonyBridgeProxyManagerLazyProxyTestsInstantiatorProxyDumperTest_%s(%wfunction '
             . '(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {'
-            . '%w$proxy->setProxyInitializer(null);%w$wrappedInstance = $container->getFooService(false);'
+            . '%w$wrappedInstance = $container->getFooService(false);%w$proxy->setProxyInitializer(null);'
             . '%wreturn true;%w}%w);%w}%w',
             $code
         );
