ServiceDefinition: simplified code

Author: dg

src/DI/Definitions/ServiceDefinition.php

@@ -184,14 +184,15 @@ public function resolveType(Nette\DI\Resolver $resolver): void
 			if (!$this->getType()) {
 				throw new ServiceCreationException('Factory and type are missing in definition of service.');
 			}
-			$this->setFactory($this->getType(), ($factory = $this->getFactory()) ? $factory->arguments : []);
+			$this->setFactory($this->getType(), $this->factory->arguments ?? []);
 
 		} elseif (!$this->getType()) {
-			$type = $resolver->resolveEntityType($this->getFactory());
-			if ($type) {
-				$this->setType($type);
-				$resolver->addDependency(new \ReflectionClass($type));
+			$type = $resolver->resolveEntityType($this->factory);
+			if (!$type) {
+				throw new ServiceCreationException('Unknown service type, specify it or declare return type of factory.');
 			}
+			$this->setType($type);
+			$resolver->addDependency(new \ReflectionClass($type));
 		}
 
 		// auto-disable autowiring for aliases
@@ -203,32 +204,30 @@ public function resolveType(Nette\DI\Resolver $resolver): void
 
 	public function complete(Nette\DI\Resolver $resolver): void
 	{
-		$entity = $this->getFactory()->getEntity();
-		$serviceRef = $entity instanceof Reference ? $resolver->normalizeReference($entity) : null;
-		$factory = $serviceRef && !$this->getFactory()->arguments && !$this->getSetup()
-			? new Statement([new Reference(Nette\DI\ContainerBuilder::THIS_CONTAINER), 'getService'], [$serviceRef->getValue()])
-			: $this->getFactory();
+		$entity = $this->factory->getEntity();
+		if ($entity instanceof Reference && !$this->factory->arguments && !$this->setup) {
+			$ref = $resolver->normalizeReference($entity);
+			$this->setFactory([new Reference(Nette\DI\ContainerBuilder::THIS_CONTAINER), 'getService'], [$ref->getValue()]);
+		}
 
-		$this->setFactory($resolver->completeStatement($factory));
+		$this->factory = $resolver->completeStatement($this->factory);
 
-		$setups = $this->getSetup();
-		foreach ($setups as &$setup) {
+		foreach ($this->setup as &$setup) {
 			if (is_string($setup->getEntity()) && strpbrk($setup->getEntity(), ':@?\\') === false) { // auto-prepend @self
 				$setup = new Statement([new Reference(Reference::SELF), $setup->getEntity()], $setup->arguments);
 			}
 			$setup = $resolver->completeStatement($setup, true);
 		}
-		$this->setSetup($setups);
 	}
 
 
 	public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGenerator $generator): void
 	{
-		$entity = $this->getFactory()->getEntity();
-		$code = '$service = ' . $generator->formatStatement($this->getFactory()) . ";\n";
+		$entity = $this->factory->getEntity();
+		$code = '$service = ' . $generator->formatStatement($this->factory) . ";\n";
 
 		if (
-			$this->getSetup()
+			$this->setup
 			&& ($type = $this->getType())
 			&& !$entity instanceof Reference && $type !== $entity
 			&& !(is_string($entity) && preg_match('#^[\w\\\\]+\z#', $entity) && is_subclass_of($entity, $type))
@@ -239,7 +238,7 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 			);
 		}
 
-		foreach ($this->getSetup() as $setup) {
+		foreach ($this->setup as $setup) {
 			$code .= $generator->formatStatement($setup) . ";\n";
 		}
 

tests/DI/ContainerBuilder.factory.error.phpt

@@ -110,7 +110,7 @@ Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('one')->setFactory('Bad7::create');
 	$builder->complete();
-}, Nette\DI\ServiceCreationException::class, "Service 'one': Type of service is unknown.");
+}, Nette\DI\ServiceCreationException::class, "Service 'one': Unknown service type, specify it or declare return type of factory.");
 
 
 class Bad8

tests/DI/ContainerBuilder.factory.resolveBuiltinTypes.phpt

@@ -136,7 +136,7 @@ namespace
 		$builder->addDefinition('f')
 			->setFactory('@factory::createObject');
 		$container = createContainer($builder);
-	}, Nette\DI\ServiceCreationException::class, "Service 'f': Type of service is unknown.");
+	}, Nette\DI\ServiceCreationException::class, "Service 'f': Unknown service type, specify it or declare return type of factory.");
 
 	Assert::exception(function () {
 		$builder = new DI\ContainerBuilder;
@@ -145,6 +145,6 @@ namespace
 		$builder->addDefinition('f')
 			->setFactory('@factory::createMixed');
 		$container = createContainer($builder);
-	}, Nette\DI\ServiceCreationException::class, "Service 'f': Type of service is unknown.");
+	}, Nette\DI\ServiceCreationException::class, "Service 'f': Unknown service type, specify it or declare return type of factory.");
 
 }