Processor: definition of 'type' will not override 'factory' of parent service (#39)

for BC compatibility, 'class' will override 'factory'

Author: dg

src/DI/Config/Processor.php

@@ -134,6 +134,9 @@ public function normalizeConfig($config): array
 			return ['factory' => $config];
 
 		} elseif (is_array($config)) {
+			if (isset($config['class']) && !isset($config['factory'])) {
+				$config['factory'] = null;
+			}
 			foreach (['class' => 'type', 'dynamic' => 'imported'] as $alias => $original) {
 				if (array_key_exists($alias, $config)) {
 					if (array_key_exists($original, $config)) {
@@ -195,22 +198,18 @@ private function updateServiceDefinition(Definitions\ServiceDefinition $definiti
 	{
 		$config = self::processArguments($config);
 
-		if (array_key_exists('type', $config) || array_key_exists('factory', $config)) {
+		if (array_key_exists('factory', $config)) {
+			$definition->setFactory($config['factory']);
 			$definition->setType(null);
-			$definition->setFactory(null);
 		}
 
 		if (array_key_exists('type', $config)) {
 			if ($config['type'] instanceof Statement) {
 				trigger_error("Service '$name': option 'type' or 'class' should be changed to 'factory'.", E_USER_DEPRECATED);
+				$definition->setFactory($config['type']);
 			} else {
 				$definition->setType($config['type']);
 			}
-			$definition->setFactory($config['type']);
-		}
-
-		if (array_key_exists('factory', $config)) {
-			$definition->setFactory($config['factory']);
 		}
 
 		if (array_key_exists('arguments', $config)) {

tests/DI/Compiler.extensionOverride.phpt

@@ -73,6 +73,10 @@ class FooExtension extends Nette\DI\CompilerExtension
 		$builder->addDefinition('one8')
 			->setFactory('Lorem', [1])
 			->addSetup('__construct', [2]);
+		$builder->addDefinition('one9')
+			->setFactory('Lorem', [1]);
+		$builder->addDefinition('one10')
+			->setFactory('Lorem', [1]);
 
 		$builder->addDefinition('two1')
 			->setType('Lorem')
@@ -101,6 +105,12 @@ class FooExtension extends Nette\DI\CompilerExtension
 		$builder->addDefinition('two9')
 			->setType('Lorem')
 			->setFactory('Factory::createLorem', [1, 2]);
+		$builder->addDefinition('two10')
+			->setType('Lorem')
+			->setFactory('Factory::createLorem', [1]);
+		$builder->addDefinition('two11')
+			->setType('Lorem')
+			->setFactory('Factory::createLorem', [1]);
 
 		$builder->addDefinition('three1')
 			->setFactory('Factory::createLorem', [1]);
@@ -116,6 +126,10 @@ class FooExtension extends Nette\DI\CompilerExtension
 			->setFactory('Factory::createLorem', [1]);
 		$builder->addDefinition('three7')
 			->setFactory('Factory::createLorem', [1]);
+		$builder->addDefinition('three8')
+			->setFactory('Factory::createLorem', [1]);
+		$builder->addDefinition('three9')
+			->setFactory('Factory::createLorem', [1]);
 	}
 }
 
@@ -166,6 +180,16 @@ Assert::same([
 	'Ipsum::__construct ',
 ], Notes::fetch());
 
+Assert::exception(function () use ($container) {
+	$container->getService('one9');
+}, TypeError::class, 'Return value of %a%::createServiceOne9() must be an instance of Ipsum, instance of Lorem returned');
+Notes::fetch();
+
+Assert::type(Ipsum::class, $container->getService('one10'));
+Assert::same([
+	'Ipsum::__construct ',
+], Notes::fetch());
+
 
 Assert::type(Ipsum::class, $container->getService('two1'));
 Assert::same([
@@ -217,6 +241,16 @@ Assert::same([
 	'Lorem::__construct 2 new',
 ], Notes::fetch());
 
+Assert::exception(function () use ($container) {
+	$container->getService('two11');
+}, TypeError::class, 'Return value of %a%::createServiceTwo11() must be an instance of Ipsum, instance of Lorem returned');
+Notes::fetch();
+
+Assert::type(Ipsum::class, $container->getService('two12'));
+Assert::same([
+	'Ipsum::__construct ',
+], Notes::fetch());
+
 
 
 Assert::type(Ipsum::class, $container->getService('three1'));
@@ -253,3 +287,13 @@ Assert::type(Ipsum::class, $container->getService('three7'));
 Assert::same([
 	'Ipsum::__construct 2',
 ], Notes::fetch());
+
+Assert::exception(function () use ($container) {
+	$container->getService('three8');
+}, TypeError::class, 'Return value of %a%::createServiceThree8() must be an instance of Ipsum, instance of Lorem returned');
+Notes::fetch();
+
+Assert::type(Ipsum::class, $container->getService('three9'));
+Assert::same([
+	'Ipsum::__construct ',
+], Notes::fetch());

tests/DI/Config.Processor.normalizeConfig.phpt

@@ -43,7 +43,7 @@ Assert::same(['implement' => Iface::class, 'tagged' => 123], $processor->normali
 
 
 // aliases
-Assert::same(['type' => 'val'], $processor->normalizeConfig(['class' => 'val']));
+Assert::same(['factory' => null, 'type' => 'val'], $processor->normalizeConfig(['class' => 'val']));
 Assert::same(['imported' => 'val'], $processor->normalizeConfig(['dynamic' => 'val']));
 
 Assert::exception(function () use ($processor) {

tests/DI/files/compiler.extensionOverride.neon

@@ -18,6 +18,10 @@ services:
 		factory: IpsumFactory::create(2)
 	one8!:
 		factory: Ipsum
+	one9:
+		type: Ipsum
+	one10:
+		class: Ipsum
 
 	two1:
 		factory: Ipsum
@@ -42,6 +46,10 @@ services:
 	two10:
 		factory: Factory::createLorem(2)
 		arguments: [1: new]
+	two11:
+		type: Ipsum
+	two12:
+		class: Ipsum
 
 	three1:
 		factory: Ipsum
@@ -59,3 +67,7 @@ services:
 		arguments: [2]
 	three7:
 		factory: IpsumFactory::create(2)
+	three8:
+		type: Ipsum
+	three9:
+		class: Ipsum