Fix the lazy PhpDumper

GuilhemN · GuilhemN · commit 82fc826c0b4d · 2016-03-16T18:40:39.000+01:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -63,15 +63,18 @@ public function isProxyCandidate(Definition $definition)
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id)
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName = null)
     {
         $instantiation = 'return';
 
         if ($definition->isShared()) {
             $instantiation .= " \$this->services['$id'] =";
         }
 
-        $methodName = 'get'.Container::camelize($id).'Service';
+        if (null === $methodName) {
+            @trigger_error(sprintf('You should use the third argument of %s to define the method to call to construct your service', __METHOD__), E_USER_DEPRECATED);
+            $methodName = 'get'.Container::camelize($id).'Service';
+        }
         $proxyClass = $this->getProxyClassName($definition);
 
         $generatedClass = $this->generateProxyClass($definition);
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -60,6 +60,27 @@ public function testGetProxyCode()
         );
     }
 
+    public function testGetProxyFactoryCodeWithCustomMethod()
+    {
+        $definition = new Definition(__CLASS__);
+
+        $definition->setLazy(true);
+
+        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', 'getFoo2Service');
+
+        $this->assertStringMatchesFormat(
+            '%wif ($lazyLoad) {%wreturn $this->services[\'foo\'] =%s'
+            .'SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest_%s(%wfunction '
+            .'(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {'
+            .'%w$wrappedInstance = $this->getFoo2Service(false);%w$proxy->setProxyInitializer(null);'
+            .'%wreturn true;%w}%w);%w}%w',
+           $code
+        );
+    }
+
+    /**
+     * @group legacy
+     */
     public function testGetProxyFactoryCode()
     {
         $definition = new Definition(__CLASS__);
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -630,19 +630,20 @@ private function addService($id, $definition)
         // with proxies, for 5.3.3 compatibility, the getter must be public to be accessible to the initializer
         $isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition);
         $visibility = $isProxyCandidate ? 'public' : 'protected';
+        $methodName = $this->generateMethodName($id);
         $code = <<<EOF
 
     /*{$this->docStar}
      * Gets the '$id' service.$doc
      *$lazyInitializationDoc
      * $return
      */
-    {$visibility} function {$this->generateMethodName($id)}($lazyInitialization)
+    {$visibility} function {$methodName}($lazyInitialization)
     {
 
 EOF;
 
-        $code .= $isProxyCandidate ? $this->getProxyDumper()->getProxyFactoryCode($definition, $id) : '';
+        $code .= $isProxyCandidate ? $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $methodName) : '';
 
         if ($definition->isSynthetic()) {
             $code .= sprintf("        throw new RuntimeException('You have requested a synthetic service (\"%s\"). The DIC does not know how to construct this service.');\n    }\n", $id);
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -34,10 +34,11 @@ public function isProxyCandidate(Definition $definition);
      *
      * @param Definition $definition
      * @param string     $id         service identifier
+     * @param string     $methodName the method name to get the service, will be added to the interface in 4.0.
      *
      * @return string
      */
-    public function getProxyFactoryCode(Definition $definition, $id);
+    public function getProxyFactoryCode(Definition $definition, $id/**, $methodName = null */);
 
     /**
      * Generates the code for the lazy proxy.
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
@@ -31,7 +31,7 @@ public function isProxyCandidate(Definition $definition)
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id)
+    public function getProxyFactoryCode(Definition $definition, $id, $methodName = null)
     {
         return '';
     }

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,11 @@ public function isProxyCandidate(Definition $definition);`
`34`	`34`	`*`
`35`	`35`	`* @param Definition $definition`
`36`	`36`	`* @param string $id service identifier`
	`37`	`+ * @param string $methodName the method name to get the service, will be added to the interface in 4.0.`
`37`	`38`	`*`
`38`	`39`	`* @return string`
`39`	`40`	`*/`
`40`		`- public function getProxyFactoryCode(Definition $definition, $id);`
	`41`	`+ public function getProxyFactoryCode(Definition $definition, $id/*, $methodName = null /);`
`41`	`42`
`42`	`43`	`/**`
`43`	`44`	`* Generates the code for the lazy proxy.`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function isProxyCandidate(Definition $definition)`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function getProxyFactoryCode(Definition $definition, $id)`
	`34`	`+ public function getProxyFactoryCode(Definition $definition, $id, $methodName = null)`
`35`	`35`	`{`
`36`	`36`	`return '';`
`37`	`37`	`}`