FactoryDefinition: added support for syntax $params in definition

Author: dg

src/DI/Definitions/FactoryDefinition.php

@@ -12,6 +12,7 @@
 use Nette;
 use Nette\DI\Helpers;
 use Nette\DI\ServiceCreationException;
+use Nette\PhpGenerator as Php;
 use Nette\Utils\Reflection;
 use Nette\Utils\Type;
 
@@ -206,6 +207,10 @@ public function complete(Nette\DI\Resolver $resolver): void
 			if (!$this->parameters) {
 				$this->completeParameters($resolver);
 			}
+			$this->convertArguments($resultDef->getFactory()->arguments);
+			foreach ($resultDef->getSetup() as $setup) {
+				$this->convertArguments($setup->arguments);
+			}
 
 			if ($resultDef->getEntity() instanceof Reference && !$resultDef->getFactory()->arguments) {
 				$resultDef->setFactory([ // render as $container->createMethod()
@@ -247,7 +252,7 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 						$class
 					));
 				}
-				$this->resultDefinition->getFactory()->arguments[$ctorParam->getPosition()] = Nette\DI\ContainerBuilder::literal('$' . $ctorParam->name);
+				$this->resultDefinition->getFactory()->arguments[$ctorParam->getPosition()] = new Php\Literal('$' . $ctorParam->name);
 
 			} elseif (!$this->resultDefinition->getSetup()) {
 				$hint = Nette\Utils\Helpers::getSuggestion(array_keys($ctorParams), $param->name);
@@ -268,9 +273,19 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 	}
 
 
-	public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGenerator $generator): void
+	public function convertArguments(array &$args): void
+	{
+		foreach ($args as &$v) {
+			if (is_string($v) && $v[0] === '$') {
+				$v = new Php\Literal($v);
+			}
+		}
+	}
+
+
+	public function generateMethod(Php\Method $method, Nette\DI\PhpGenerator $generator): void
 	{
-		$class = (new Nette\PhpGenerator\ClassType)
+		$class = (new Php\ClassType)
 			->addImplement($this->getType());
 
 		$class->addProperty('container')

tests/DI/files/compiler.generatedFactory.neon

@@ -17,7 +17,7 @@ services:
 
 	article2:
 		implement: IArticleFactory
-		arguments: [%title%]
+		arguments: [$title]
 		parameters: [title]
 
 	fooFactory1: