FactoryDefinition::resolveType() checks for type compatibility

nette · Sep 29, 2021 · cc7c4e7 · cc7c4e7
1 parent 1a04219
commit cc7c4e7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/src/DI/Definitions/FactoryDefinition.php b/src/DI/Definitions/FactoryDefinition.php
@@ -178,24 +178,31 @@ public function getParameters(): array
 
 	public function resolveType(Nette\DI\Resolver $resolver): void
 	{
+		$interface = $this->getType();
+		if (!$interface) {
+			throw new ServiceCreationException('Type is missing in definition of service.');
+		}
+		$method = new \ReflectionMethod($interface, self::METHOD_CREATE);
+		$type = Type::fromReflection($method) ?? Helpers::getReturnTypeAnnotation($method);
+
 		$resultDef = $this->resultDefinition;
 		try {
 			$resolver->resolveDefinition($resultDef);
-			return;
 		} catch (ServiceCreationException $e) {
-		}
-
-		if (!$resultDef->getType()) {
-			$interface = $this->getType();
-			if (!$interface) {
-				throw new ServiceCreationException('Type is missing in definition of service.');
+			if ($resultDef->getType()) {
+				throw $e;
 			}
-			$method = new \ReflectionMethod($interface, self::METHOD_CREATE);
-			$type = Type::fromReflection($method) ?? Helpers::getReturnTypeAnnotation($method);
 			$resultDef->setType(Helpers::ensureClassType($type, "return type of $interface::create()"));
+			$resolver->resolveDefinition($resultDef);
 		}
 
-		$resolver->resolveDefinition($resultDef);
+		if ($type && !$type->allows($resultDef->getType())) {
+			throw new ServiceCreationException(sprintf(
+				'Factory for %s cannot create incompatible %s type.',
+				$type,
+				$resultDef->getType()
+			));
+		}
 	}
 
 

diff --git a/tests/DI/Definitions.FactoryDefinition.resolve.phpt b/tests/DI/Definitions.FactoryDefinition.resolve.phpt
@@ -68,3 +68,13 @@ Assert::noError(function () {
 	$resolver->resolveDefinition($def);
 	$resolver->completeDefinition($def);
 });
+
+
+Assert::exception(function () {
+	$def = new FactoryDefinition;
+	$def->setImplement(Good2::class);
+	$def->getResultDefinition()->setType(DateTime::class);
+
+	$resolver = new Nette\DI\Resolver(new Nette\DI\ContainerBuilder);
+	$resolver->resolveDefinition($def);
+}, Nette\DI\ServiceCreationException::class, 'Service of type Good2: Factory for stdClass cannot create incompatible DateTime type.');