Add a new method to the compiled container

GuilhemN · GuilhemN · commit 69520c44f859 · 2016-03-16T19:28:03.000+01:00
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -63,18 +63,15 @@ public function isProxyCandidate(Definition $definition)
     /**
      * {@inheritdoc}
      */
-    public function getProxyFactoryCode(Definition $definition, $id, $methodName = null)
+    public function getProxyFactoryCode(Definition $definition, $id)
     {
         $instantiation = 'return';
 
         if ($definition->isShared()) {
             $instantiation .= " \$this->services['$id'] =";
         }
 
-        if (null === $methodName) {
-            @trigger_error(sprintf('You must use the third argument of %s to define the method to call to construct your service since version 3.1, not using it won\'t be supported in 4.0.', __METHOD__), E_USER_DEPRECATED);
-            $methodName = 'get'.Container::camelize($id).'Service';
-        }
+        $methodName = 'get'.Container::camelize($id).'Service';
         $proxyClass = $this->getProxyClassName($definition);
 
         $generatedClass = $this->generateProxyClass($definition);
@@ -88,7 +85,12 @@ public function getProxyFactoryCode(Definition $definition, $id, $methodName = n
 
             $instantiation $constructorCall(
                 function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) {
-                    \$wrappedInstance = \$this->$methodName(false);
+                    if (method_exists(\$this, 'getMethodFor')) {
+                        \$method = \$this->getMethodFor('$id');
+                        \$wrappedInstance = \$this->$methodName(false);
+                    } else {
+                        \$wrappedInstance = \$this->$methodName(false);
+                    }
 
                     \$proxy->setProxyInitializer(null);
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -853,6 +853,30 @@ public function compile()
         throw new LogicException('You cannot compile a dumped frozen container.');
     }
 
+EOF;
+    }
+
+    /**
+     * Adds the getter for the method map.
+     *
+     * @return string
+     */
+    private function addMethodMapGetter()
+    {
+        return <<<EOF
+
+    /*{$this->docStar}
+     * {@inheritdoc}
+     */
+    public function getMethodFor(\$id)
+    {
+        if (isset(\$this->methodMap[\$id])) {
+            return \$this->methodMap[\$id];
+        }
+
+        throw new LogicException(sprintf('Service %s doesn\'t exist.', \$id));
+    }
+
 EOF;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -34,11 +34,10 @@ 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/**, $methodName = null */);
+    public function getProxyFactoryCode(Definition $definition, $id);
 
     /**
      * 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, $methodName = null)
+    public function getProxyFactoryCode(Definition $definition, $id)
     {
         return '';
     }

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,10 @@ 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.`
`38`	`37`	`*`
`39`	`38`	`* @return string`
`40`	`39`	`*/`
`41`		`- public function getProxyFactoryCode(Definition $definition, $id/*, $methodName = null /);`
	`40`	`+ public function getProxyFactoryCode(Definition $definition, $id);`
`42`	`41`
`43`	`42`	`/**`
`44`	`43`	`* 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, $methodName = null)`
	`34`	`+ public function getProxyFactoryCode(Definition $definition, $id)`
`35`	`35`	`{`
`36`	`36`	`return '';`
`37`	`37`	`}`