InjectExtension: scans resolved class [Closes #218]

Author: dg

src/DI/Extensions/InjectExtension.php

@@ -44,7 +44,8 @@ public function beforeCompile()
 
 	private function updateDefinition(Definitions\ServiceDefinition $def): void
 	{
-		$class = $def->getType();
+		$resolver = new DI\Resolver($this->getContainerBuilder());
+		$class = $resolver->resolveEntityType($def->getFactory()) ?: $def->getType();
 		$setups = $def->getSetup();
 
 		foreach (self::getInjectProperties($class) as $property => $type) {
@@ -61,7 +62,7 @@ private function updateDefinition(Definitions\ServiceDefinition $def): void
 			array_unshift($setups, $inject);
 		}
 
-		foreach (array_reverse(self::getInjectMethods($def->getType())) as $method) {
+		foreach (array_reverse(self::getInjectMethods($class)) as $method) {
 			$inject = new Definitions\Statement($method);
 			foreach ($setups as $key => $setup) {
 				if ($setup->getEntity() === $inject->getEntity()) {

tests/DI/InjectExtension.interface.phpt

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Test: Nette\DI\Compiler: inject.
+ */
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Nette\DI\Definitions\Reference;
+use Nette\DI\Definitions\Statement;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+interface IService
+{
+}
+
+class Service implements IService
+{
+	public $foo;
+
+	public function injectFoo(stdClass $foo)
+	{
+		$this->foo = $foo;
+	}
+}
+
+
+$compiler = new DI\Compiler;
+$compiler->addExtension('inject', new Nette\DI\Extensions\InjectExtension);
+$container = createContainer($compiler, '
+services:
+	one:
+		type: IService
+		factory: Service
+		inject: true
+');
+
+
+$builder = $compiler->getContainerBuilder();
+
+Assert::equal([
+	new Statement([new Reference('self'), 'injectFoo']),
+], $builder->getDefinition('one')->getSetup());