improved exception messages

Author: dg

src/DI/Container.php

@@ -77,7 +77,7 @@ public function addService(string $name, $service)
 
 		if ($service instanceof \Closure) {
 			$rt = Nette\Utils\Type::fromReflection(new \ReflectionFunction($service));
-			$type = $rt ? Helpers::ensureClassType($rt, 'return type of factory') : '';
+			$type = $rt ? Helpers::ensureClassType($rt, 'return type of closure') : '';
 		} else {
 			$type = get_class($service);
 		}

src/DI/Definitions/ServiceDefinition.php

@@ -185,7 +185,7 @@ public function resolveType(Nette\DI\Resolver $resolver): void
 		} elseif (!$this->getType()) {
 			$type = $resolver->resolveEntityType($this->factory);
 			if (!$type) {
-				throw new ServiceCreationException('Unknown service type, specify it or declare return type of factory.');
+				throw new ServiceCreationException('Unknown service type, specify it or declare return type of factory method.');
 			}
 
 			$this->setType($type);

tests/DI/Container.dynamic.php80.phpt

@@ -19,4 +19,4 @@ $container = new Container;
 Assert::exception(function () use ($container) {
 	@$container->addService('six', function (): stdClass|Closure {}); // @ triggers service should be defined as "imported"
 	$container->getService('six');
-}, Nette\InvalidStateException::class, "Return type of factory is not expected to be nullable/union/intersection/built-in, 'stdClass|Closure' given.");
+}, Nette\InvalidStateException::class, "Return type of closure is not expected to be nullable/union/intersection/built-in, 'stdClass|Closure' given.");

tests/DI/ContainerBuilder.factory.error.phpt

@@ -117,7 +117,7 @@ Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('one')->setFactory('Bad7::create');
 	$builder->complete();
-}, Nette\DI\ServiceCreationException::class, "Service 'one': Unknown service type, specify it or declare return type of factory.");
+}, Nette\DI\ServiceCreationException::class, "Service 'one': Unknown service type, specify it or declare return type of factory method.");
 
 
 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': Unknown service type, specify it or declare return type of factory.");
+	}, Nette\DI\ServiceCreationException::class, "Service 'f': Unknown service type, specify it or declare return type of factory method.");
 
 	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': Unknown service type, specify it or declare return type of factory.");
+	}, Nette\DI\ServiceCreationException::class, "Service 'f': Unknown service type, specify it or declare return type of factory method.");
 
 }

tests/DI/ContainerBuilder.resolveTypes.phpt

@@ -140,14 +140,14 @@ Assert::exception(function () {
 	$builder->addDefinition('a')
 		->setFactory([Factory::class, 'createObjectPhpDoc']);
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory.");
+}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory method.");
 
 Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('a')
 		->setFactory([Factory::class, 'createObject']);
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory.");
+}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory method.");
 
 Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
@@ -161,14 +161,14 @@ Assert::exception(function () {
 	$builder->addDefinition('a')
 		->setFactory([Factory::class, 'createMixedPhpDoc']);
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory.");
+}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory method.");
 
 Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('a')
 		->setFactory([Factory::class, 'createMixed']);
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory.");
+}, Nette\DI\ServiceCreationException::class, "Service 'a': Unknown service type, specify it or declare return type of factory method.");
 
 Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;