Move factory reference expand into definition class

zanbaldwin · zanbaldwin · commit 3b7bc8953632 · 2019-02-18T17:48:08.000Z
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -127,9 +127,6 @@ protected function getConstructor(Definition $definition, $required)
         }
 
         if ($factory) {
-            if ($factory instanceof Reference) {
-                $factory = [$factory, '__invoke'];
-            }
             list($class, $method) = $factory;
             if ($class instanceof Reference) {
                 $class = $this->container->findDefinition((string) $class)->getClass();
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -107,6 +107,10 @@ public function setFactory($factory)
             $factory = explode('::', $factory, 2);
         }
 
+        if ($factory instanceof Reference) {
+            $factory = [$factory, '__invoke'];
+        }
+
         $this->factory = $factory;
 
         return $this;
@@ -782,7 +786,7 @@ public function getDeprecationMessage($id)
     /**
      * Sets a configurator to call after the service is fully initialized.
      *
-     * @param string|array $configurator A PHP callable
+     * @param string|array|Reference $configurator A PHP function or an array containing a class/Reference and a method to call
      *
      * @return $this
      */
@@ -794,6 +798,10 @@ public function setConfigurator($configurator)
             $configurator = explode('::', $configurator, 2);
         }
 
+        if ($configurator instanceof Reference) {
+            $configurator = [$configurator, '__invoke'];
+        }
+
         $this->configurator = $configurator;
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,6 @@ protected function getConstructor(Definition $definition, $required)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if ($factory) {`
`130`		`- if ($factory instanceof Reference) {`
`131`		`- $factory = [$factory, '__invoke'];`
`132`		`- }`
`133`	`130`	`list($class, $method) = $factory;`
`134`	`131`	`if ($class instanceof Reference) {`
`135`	`132`	`$class = $this->container->findDefinition((string) $class)->getClass();`