ContainerBuilder: improved generated factory parameters resolution [Closes #17]

Author: enumag

src/DI/ContainerBuilder.php

@@ -306,7 +306,10 @@ private function resolveImplement(ServiceDefinition $def, $name)
 
 		if (!$def->parameters) {
 			$ctorParams = array();
-			if ($def->factory && !$def->factory->arguments && ($class = $this->resolveEntityClass($def->factory, array($name => 1)))
+			if (empty($def->factory->entity)) {
+				$def->setFactory($def->class, $def->factory ? $def->factory->arguments : array());
+			}
+			if (($class = $this->resolveEntityClass($def->factory, array($name => 1)))
 				&& ($ctor = Reflection\ClassType::from($class)->getConstructor())
 			) {
 				foreach ($ctor->getParameters() as $param) {

tests/DI/Compiler.generatedFactory.phpt

@@ -97,6 +97,23 @@ interface IFooFactory
 	public function create(Baz $baz = NULL);
 }
 
+class TestClass
+{
+	public $foo;
+	public $bar;
+	public function __construct($foo, $bar)
+	{
+		$this->foo = $foo;
+		$this->bar = $bar;
+	}
+}
+
+interface ITestClassFactory
+{
+	/** @return TestClass */
+	public function create($bar);
+}
+
 class TestExtension extends DI\CompilerExtension
 {
 	public function loadConfiguration()
@@ -184,6 +201,26 @@ Assert::same($container->getService('bar'), $foo->bar);
 Assert::null( $foo->baz );
 
 
+Assert::type( 'IFooFactory', $container->getService('fooFactory4') );
+$foo = $container->getService('fooFactory4')->create($container->getService('baz'));
+Assert::type( 'Foo', $foo );
+Assert::type( 'Bar', $foo->bar );
+Assert::same($container->getService('bar'), $foo->bar);
+Assert::type( 'Baz', $foo->baz );
+Assert::same($container->getService('baz'), $foo->baz);
+$foo = $container->getService('fooFactory4')->create();
+Assert::type( 'Foo', $foo );
+Assert::type( 'Bar', $foo->bar );
+Assert::same($container->getService('bar'), $foo->bar);
+Assert::null( $foo->baz );
+
+
+Assert::type( 'ITestClassFactory', $container->getService('factory5') );
+$obj = $container->getService('factory5')->create('bar');
+Assert::same('foo', $obj->foo);
+Assert::same('bar', $obj->bar);
+
+
 class Bad1
 {
 	public function __construct(Bar $bar)

tests/DI/files/compiler.generatedFactory.neon

@@ -25,3 +25,9 @@ services:
 	fooFactory3:
 		create: Foo
 		implement: IFooFactory
+
+	fooFactory4: IFooFactory
+
+	factory5:
+		implement: ITestClassFactory
+		arguments: ['foo']