[DependencyInjection] Invokable Factory Services

zanbaldwin · zanbaldwin · commit 910b87de0602 · 2019-02-19T11:31:09.000Z
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -95,7 +95,7 @@ public function setChanges(array $changes)
     /**
      * Sets a factory.
      *
-     * @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
+     * @param string|array|Reference $factory A PHP function or an array containing a class/Reference and a method to call
      *
      * @return $this
      */
@@ -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;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -317,7 +317,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
                     $class = $factory->hasAttribute('class') ? $factory->getAttribute('class') : null;
                 }
 
-                $definition->setFactory([$class, $factory->getAttribute('method')]);
+                $definition->setFactory([$class, $factory->hasAttribute('method') ? $factory->getAttribute('method') : '__invoke']);
             }
         }
 
@@ -332,7 +332,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
                     $class = $configurator->getAttribute('class');
                 }
 
-                $definition->setConfigurator([$class, $configurator->getAttribute('method')]);
+                $definition->setConfigurator([$class, $configurator->hasAttribute('method') ? $configurator->getAttribute('method') : '__invoke']);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -571,12 +571,15 @@ private function parseDefinition($id, $service, $file, array $defaults)
      *
      * @throws InvalidArgumentException When errors occur
      *
-     * @return string|array A parsed callable
+     * @return string|array|Reference A parsed callable
      */
     private function parseCallable($callable, $parameter, $id, $file)
     {
         if (\is_string($callable)) {
             if ('' !== $callable && '@' === $callable[0]) {
+                if (false === strpos($callable, ':')) {
+                    return [$this->resolveServices($callable, $file), '__invoke'];
+                }
                 throw new InvalidArgumentException(sprintf('The value of the "%s" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $parameter, $id, $callable, substr($callable, 1)));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function setChanges(array $changes)`
`95`	`95`	`/**`
`96`	`96`	`* Sets a factory.`
`97`	`97`	`*`
`98`		`- * @param string\|array $factory A PHP function or an array containing a class/Reference and a method to call`
	`98`	`+ * @param string\|array\|Reference $factory A PHP function or an array containing a class/Reference and a method to call`
`99`	`99`	`*`
`100`	`100`	`* @return $this`
`101`	`101`	`*/`
`@@ -107,6 +107,10 @@ public function setFactory($factory)`
`107`	`107`	`$factory = explode('::', $factory, 2);`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ if ($factory instanceof Reference) {`
	`111`	`+ $factory = [$factory, '__invoke'];`
	`112`	`+ }`
	`113`	`+`
`110`	`114`	`$this->factory = $factory;`
`111`	`115`
`112`	`116`	`return $this;`
`@@ -782,7 +786,7 @@ public function getDeprecationMessage($id)`
`782`	`786`	`/**`
`783`	`787`	`* Sets a configurator to call after the service is fully initialized.`
`784`	`788`	`*`
`785`		`- * @param string\|array $configurator A PHP callable`
	`789`	`+ * @param string\|array\|Reference $configurator A PHP function or an array containing a class/Reference and a method to call`
`786`	`790`	`*`
`787`	`791`	`* @return $this`
`788`	`792`	`*/`
`@@ -794,6 +798,10 @@ public function setConfigurator($configurator)`
`794`	`798`	`$configurator = explode('::', $configurator, 2);`
`795`	`799`	`}`
`796`	`800`
	`801`	`+ if ($configurator instanceof Reference) {`
	`802`	`+ $configurator = [$configurator, '__invoke'];`
	`803`	`+ }`
	`804`	`+`
`797`	`805`	`$this->configurator = $configurator;`
`798`	`806`
`799`	`807`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)`
`317`	`317`	`$class = $factory->hasAttribute('class') ? $factory->getAttribute('class') : null;`
`318`	`318`	`}`
`319`	`319`
`320`		`- $definition->setFactory([$class, $factory->getAttribute('method')]);`
	`320`	`+ $definition->setFactory([$class, $factory->hasAttribute('method') ? $factory->getAttribute('method') : '__invoke']);`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
`@@ -332,7 +332,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)`
`332`	`332`	`$class = $configurator->getAttribute('class');`
`333`	`333`	`}`
`334`	`334`
`335`		`- $definition->setConfigurator([$class, $configurator->getAttribute('method')]);`
	`335`	`+ $definition->setConfigurator([$class, $configurator->hasAttribute('method') ? $configurator->getAttribute('method') : '__invoke']);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -571,12 +571,15 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`571`	`571`	`*`
`572`	`572`	`* @throws InvalidArgumentException When errors occur`
`573`	`573`	`*`
`574`		`- * @return string\|array A parsed callable`
	`574`	`+ * @return string\|array\|Reference A parsed callable`
`575`	`575`	`*/`
`576`	`576`	`private function parseCallable($callable, $parameter, $id, $file)`
`577`	`577`	`{`
`578`	`578`	`if (\is_string($callable)) {`
`579`	`579`	`if ('' !== $callable && '@' === $callable[0]) {`
	`580`	`+ if (false === strpos($callable, ':')) {`
	`581`	`+ return [$this->resolveServices($callable, $file), '__invoke'];`
	`582`	`+ }`
`580`	`583`	`throw new InvalidArgumentException(sprintf('The value of the "%s" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s").', $parameter, $id, $callable, substr($callable, 1)));`
`581`	`584`	`}`
`582`	`585`