Processor: definition of 'type' will not overide 'factory' of parent …

…service (BC break) (#39)
nette · Mar 14, 2019 · fafd328 · fafd328
1 parent 368865f
commit fafd328
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/DI/Config/Processor.php b/src/DI/Config/Processor.php
@@ -195,22 +195,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)) {