ContainerBuilder: Implemented automatic resolution of parameters [Closes

 #4]

src/DI/ContainerBuilder.php

@@ -302,7 +302,23 @@ 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)))
+				&& ($ctor = Reflection\ClassType::from($class)->getConstructor())
+			) {
+				foreach ($ctor->getParameters() as $param) {
+					$ctorParams[$param->getName()] = $param;
+				}
+			}
+
 			foreach ($method->getParameters() as $param) {
+				if (isset($ctorParams[$param->getName()])) {
+					$arg = $ctorParams[$param->getName()];
+					if ($param->getClassName() !== $arg->getClassName() || $param->isArray() !== $arg->isArray()) {
+						throw new ServiceCreationException("Type hint for $arg doesn't match type hint for $param");
+					}
+					$def->factory->arguments[$arg->getPosition()] = ContainerBuilder::literal('$' . $arg->getName());
+				}
 				$paramDef = ($param->isArray() ? 'array' : $param->getClassName()) . ' ' . $param->getName();
 				if ($param->isOptional()) {
 					$def->parameters[$paramDef] = $param->getDefaultValue();

tests/DI/Compiler.generatedFactory.phpt

@@ -168,3 +168,36 @@ Assert::type('IArticleFactory', $container->getService('article2'));
 $article = $container->getService('article2')->create('nemam');
 Assert::type('Article', $article);
 Assert::same('nemam', $article->title);
+
+
+Assert::type( 'IFooFactory', $container->getService('fooFactory3') );
+$foo = $container->getService('fooFactory3')->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('fooFactory3')->create();
+Assert::type( 'Foo', $foo );
+Assert::type( 'Bar', $foo->bar );
+Assert::same($container->getService('bar'), $foo->bar);
+Assert::null( $foo->baz );
+
+
+class Bad1
+{
+	public function __construct(Bar $bar)
+	{
+	}
+}
+
+interface Bad2
+{
+	public function create(Baz $bar);
+}
+
+Assert::exception(function() {
+	$builder = new DI\ContainerBuilder;
+	$builder->addDefinition('one')->setImplement('Bad2')->setFactory('Bad1');
+	$builder->generateClasses();
+}, 'Nette\InvalidStateException', "Type hint for \$bar in Bad1::__construct() doesn't match type hint for \$bar in Bad2::create()");

tests/DI/files/compiler.generatedFactory.neon

@@ -21,3 +21,7 @@ services:
 		create: Foo(..., %baz%)
 		implement: IFooFactory
 		parameters: [Baz baz = NULL]
+
+	fooFactory3:
+		create: Foo
+		implement: IFooFactory