Container::getServiceType() ignores dynamically added services (BC br…

…eak)
nette · Apr 28, 2024 · 067cdf5 · 067cdf5
1 parent ed53906
commit 067cdf5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/DI/Container.php b/src/DI/Container.php
@@ -100,10 +100,10 @@ public function addService(string $name, object $service): static
 			$type = $service::class;
 		}
 
-		if (!isset($this->methods[self::getMethodName($name)])) {
-			$this->types[$name] = $type;
-
-		} elseif (($expectedType = $this->getServiceType($name)) && !is_a($type, $expectedType, allow_string: true)) {
+		if (isset($this->methods[self::getMethodName($name)])
+			&& ($expectedType = $this->getServiceType($name))
+			&& !is_a($type, $expectedType, allow_string: true)
+		) {
 			throw new Nette\InvalidArgumentException(sprintf(
 				"Service '%s' must be instance of %s, %s.",
 				$name,
@@ -114,7 +114,6 @@ public function addService(string $name, object $service): static
 
 		if ($service instanceof \Closure) {
 			$this->factories[$name] = $service;
-			$this->types[$name] = $type;
 		} else {
 			$this->instances[$name] = $service;
 		}
@@ -182,7 +181,7 @@ public function getServiceType(string $name): string
 			return (string) (new \ReflectionFunction($cb))->getReturnType();
 
 		} else {
-			throw new MissingServiceException(sprintf("Service '%s' not found.", $name));
+			throw new MissingServiceException(sprintf("Type of service '%s' not known.", $name));
 		}
 	}
 

diff --git a/tests/DI/Container.dynamic.phpt b/tests/DI/Container.dynamic.phpt
@@ -32,12 +32,16 @@ test('basic', function () {
 
 	Assert::same($one, $container->getService('one'));
 	Assert::same($two, $container->getService('two'));
-
-	Assert::same(Service::class, $container->getServiceType('one'));
-	Assert::same(Service::class, $container->getServiceType('two'));
 });
 
 
+testException('type not known', function () {
+	$container = new Container;
+	$container->addService('one', new Service);
+	$container->getServiceType('one');
+}, Nette\DI\MissingServiceException::class, "Type of service 'one' not known.");
+
+
 test('closure', function () {
 	$container = new Container;
 	$container->addService('four', fn() => new Service);

diff --git a/tests/DI/Container.getServiceType.phpt b/tests/DI/Container.getServiceType.phpt
@@ -40,5 +40,5 @@ Assert::same('One', $container->getServiceType('three'));
 Assert::exception(
 	fn() => $container->getServiceType('four'),
 	Nette\DI\MissingServiceException::class,
-	"Service 'four' not found.",
+	"Type of service 'four' not known.",
 );
diff --git a/tests/DI/Container.static-dynamic.phpt b/tests/DI/Container.static-dynamic.phpt
@@ -60,7 +60,7 @@ test('closure & typehint', function () {
 
 	$container->addService('one', fn(): stdClass => new stdClass);
 
-	Assert::same(stdClass::class, $container->getServiceType('one'));
+	Assert::same('', $container->getServiceType('one'));
 	Assert::true($container->hasService('one'));
 	Assert::type(stdClass::class, $container->getService('one'));
 });
@@ -75,7 +75,7 @@ test('closure & matching typehint', function () {
 
 	$container->addService('typehint', fn(): MyClass => new MyClass);
 
-	Assert::same(MyClass::class, $container->getServiceType('typehint'));
+	Assert::same(stdClass::class, $container->getServiceType('typehint'));
 	Assert::true($container->hasService('typehint'));
 	Assert::type(MyClass::class, $container->getService('typehint'));
 });