Container::getByType() fixed cooperation with dynamic factory [Closes #314]

Author: dg

src/DI/Container.php

@@ -265,22 +265,11 @@ public function getByType(string $type, bool $throw = true): ?object
 		} elseif ($throw) {
 			if (!class_exists($type) && !interface_exists($type)) {
 				throw new MissingServiceException(sprintf("Service of type '%s' not found. Check the class name because it cannot be found.", $type));
+			} elseif ($this->findByType($type)) {
+				throw new MissingServiceException(sprintf("Service of type %s is not autowired or is missing in di\u{a0}›\u{a0}export\u{a0}›\u{a0}types.", $type));
+			} else {
+				throw new MissingServiceException(sprintf('Service of type %s not found. Did you add it to configuration file?', $type));
 			}
-
-			foreach ($this->methods as $method => $foo) {
-				$methodType = (new \ReflectionMethod(static::class, $method))->getReturnType()->getName();
-				if (is_a($methodType, $type, true)) {
-					throw new MissingServiceException(sprintf(
-						"Service of type %s is not autowired or is missing in di\u{a0}›\u{a0}export\u{a0}›\u{a0}types.",
-						$type
-					));
-				}
-			}
-
-			throw new MissingServiceException(sprintf(
-				'Service of type %s not found. Did you add it to configuration file?',
-				$type
-			));
 		}
 
 		return null;

tests/DI/Container.dynamic.phpt

@@ -64,6 +64,25 @@ test('closure with typehint', function () {
 });
 
 
+// getByType()
+Assert::exception(function () {
+	$container = new Container;
+	$container->addService('one', function () {
+		return new Service;
+	});
+	$container->getByType(Service::class);
+}, Nette\DI\MissingServiceException::class, 'Service of type Service not found. Did you add it to configuration file?');
+
+
+Assert::exception(function () {
+	$container = new Container;
+	$container->addService('one', function (): Service {
+		return new Service;
+	});
+	$container->getByType(Service::class);
+}, Nette\DI\MissingServiceException::class, 'Service of type Service not found. Did you add it to configuration file?');
+
+
 // bad closure
 Assert::exception(function () {
 	$container = new Container;