exception messages use [Service ...]\n format

src/DI/Definitions/AccessorDefinition.php

@@ -29,7 +29,7 @@ final class AccessorDefinition extends Definition
 	public function setImplement(string $type)
 	{
 		if (!interface_exists($type)) {
-			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Interface '$type' not found.");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface '$type' not found.");
 		}
 		$rc = new \ReflectionClass($type);
 
@@ -40,9 +40,9 @@ public function setImplement(string $type)
 			|| $method->getName() !== self::METHOD_GET
 			|| count($rc->getMethods()) > 1
 		) {
-			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Interface $type must have just one non-static method get().");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface $type must have just one non-static method get().");
 		} elseif ($method->getNumberOfParameters()) {
-			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Method $type::get() must have no parameters.");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nMethod $type::get() must have no parameters.");
 		}
 		return parent::setType($type);
 	}

src/DI/Definitions/Definition.php

@@ -55,6 +55,26 @@ final public function getName(): ?string
 	}
 
 
+	final public function isAnonymous(): bool
+	{
+		return !$this->name || ctype_digit($this->name);
+	}
+
+
+	public function getDescriptiveName(): string
+	{
+		if (!$this->isAnonymous()) {
+			return "[Service '$this->name'" . ($this->type ? " of type $this->type" : '') . ']';
+
+		} elseif ($this->type) {
+			return "[Service of type $this->type]";
+
+		} else {
+			return '[Service ?]';
+		}
+	}
+
+
 	/** @return static */
 	protected function setType(?string $type)
 	{
@@ -64,7 +84,7 @@ protected function setType(?string $type)
 		if ($type === null) {
 			$this->type = null;
 		} elseif (!class_exists($type) && !interface_exists($type)) {
-			throw new Nette\InvalidArgumentException("Service '$this->name': Class or interface '$type' not found.");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nClass or interface '$type' not found.");
 		} else {
 			$this->type = Nette\DI\Helpers::normalizeClass($type);
 		}

src/DI/Definitions/FactoryDefinition.php

@@ -38,12 +38,12 @@ public function __construct()
 	public function setImplement(string $type)
 	{
 		if (!interface_exists($type)) {
-			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Interface '$type' not found.");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface '$type' not found.");
 		}
 		$rc = new \ReflectionClass($type);
 		$method = $rc->getMethods()[0] ?? null;
 		if (!$method || $method->isStatic() || $method->name !== self::METHOD_CREATE || count($rc->getMethods()) > 1) {
-			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Interface $type must have just one non-static method create().");
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface $type must have just one non-static method create().");
 		}
 		return parent::setType($type);
 	}

src/DI/Definitions/LocatorDefinition.php

@@ -29,24 +29,22 @@ final class LocatorDefinition extends Definition
 	public function setImplement(string $type)
 	{
 		if (!interface_exists($type)) {
-			throw new Nette\InvalidArgumentException(sprintf("Service '%s': Interface '%s' not found.", $this->getName(), $type));
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface '$type' not found.");
 		}
 		$methods = (new \ReflectionClass($type))->getMethods();
 		if (!$methods) {
-			throw new Nette\InvalidArgumentException(sprintf("Service '%s': Interface %s must have at least one method.", $this->getName(), $type));
+			throw new Nette\InvalidArgumentException($this->getDescriptiveName() . "\nInterface $type must have at least one method.");
 		}
 
 		foreach ($methods as $method) {
 			if ($method->isStatic() || !(
 				(preg_match('#^(get|create)$#', $method->name) && $method->getNumberOfParameters() === 1)
 				|| (preg_match('#^(get|create)[A-Z]#', $method->name) && $method->getNumberOfParameters() === 0)
 			)) {
-				throw new Nette\InvalidArgumentException(sprintf(
-					"Service '%s': Method %s::%s() does not meet the requirements: is create(\$name), get(\$name), create*() or get*() and is non-static.",
-					$this->getName(),
-					$type,
-					$method->name
-				));
+				throw new Nette\InvalidArgumentException(
+					$this->getDescriptiveName()
+					. "\nMethod $type::{$method->name}() does not meet the requirements: is create(\$name), get(\$name), create*() or get*() and is non-static.",
+				);
 			}
 		}
 		return parent::setType($type);
@@ -104,7 +102,7 @@ public function complete(Nette\DI\Resolver $resolver): void
 			$this->references = [];
 			foreach ($resolver->getContainerBuilder()->findByTag($this->tagged) as $name => $tag) {
 				if (isset($this->references[$tag])) {
-					trigger_error("Service '{$this->getName()}': duplicated tag '$this->tagged' with value '$tag'.", E_USER_NOTICE);
+					trigger_error($this->getDescriptiveName() . "\nDuplicated tag '$this->tagged' with value '$tag'.", E_USER_NOTICE);
 				}
 				$this->references[$tag] = new Reference($name);
 			}

src/DI/Definitions/ServiceDefinition.php

@@ -255,6 +255,24 @@ public function __clone()
 		$this->factory = unserialize(serialize($this->factory));
 		$this->setup = unserialize(serialize($this->setup));
 	}
+
+
+	public function getDescriptiveName(): string
+	{
+		$entity = $this->getEntity();
+		if ($entity && $this->isAnonymous() && !$this->getType()) {
+			if ($entity instanceof Reference) {
+				$entity = '@' . $entity->getValue();
+			} elseif (is_array($entity)) {
+				if ($entity[0] instanceof Reference) {
+					$entity[0] = '@' . $entity[0]->getValue();
+				}
+				$entity = is_string($entity[0]) ? implode('::', $entity) : $entity[1];
+			}
+			return "[Service $entity]";
+		}
+		return parent::getDescriptiveName();
+	}
 }
 
 

src/DI/Extensions/DIExtension.php

@@ -125,7 +125,7 @@ private function restrictTypes(Nette\PhpGenerator\ClassType $class): void
 	private function initializeTaggedServices(): void
 	{
 		foreach (array_filter($this->getContainerBuilder()->findByTag('run')) as $name => $on) {
-			trigger_error("Tag 'run' used in service '$name' definition is deprecated.", E_USER_DEPRECATED);
+			trigger_error("[Service '$name']\nTag 'run' is deprecated.", E_USER_DEPRECATED);
 			$this->initialization->addBody('$this->getService(?);', [$name]);
 		}
 	}

src/DI/Extensions/ServicesExtension.php

@@ -55,7 +55,7 @@ private function loadDefinition(?string $name, \stdClass $config): void
 				$this->getContainerBuilder()->removeDefinition($name);
 				return;
 			} elseif (!empty($config->alteration) && !$this->getContainerBuilder()->hasDefinition($name)) {
-				throw new Nette\DI\InvalidConfigurationException('missing original definition for alteration.');
+				throw new Nette\DI\InvalidConfigurationException('Missing original definition for alteration.');
 			}
 
 			$def = $this->retrieveDefinition($name, $config);
@@ -69,8 +69,13 @@ private function loadDefinition(?string $name, \stdClass $config): void
 			];
 			$this->{$methods[$config->defType]}($def, $config);
 			$this->updateDefinition($def, $config);
+
 		} catch (\Exception $e) {
-			throw new Nette\DI\InvalidConfigurationException(($name ? "Service '$name': " : '') . $e->getMessage(), 0, $e);
+			$message = $e->getMessage();
+			if ($name && !Nette\Utils\Strings::startsWith($message, '[Service ')) {
+				$message = "[Service '$name']\n$message";
+			}
+			throw new Nette\DI\InvalidConfigurationException($message, 0, $e);
 		}
 	}
 

src/DI/PhpGenerator.php

@@ -104,7 +104,7 @@ public function generateMethod(Definitions\Definition $def): Php\Method
 			return $method;
 
 		} catch (\Exception $e) {
-			throw new ServiceCreationException("Service '$name': " . $e->getMessage(), 0, $e);
+			throw new ServiceCreationException($this->getDescriptiveName() . "\n" . $e->getMessage(), 0, $e);
 		}
 	}
 

src/DI/Resolver.php

@@ -412,24 +412,15 @@ public function addDependency($dep)
 
 	private function completeException(\Exception $e, Definition $def): ServiceCreationException
 	{
-		if ($e instanceof ServiceCreationException && Strings::startsWith($e->getMessage(), "Service '")) {
+		$message = $e->getMessage();
+		if ($e instanceof ServiceCreationException && Strings::startsWith($message, '[Service ')) {
 			return $e;
 		}
 
-		$name = $def->getName();
-		$type = $def->getType();
-		if ($name && !ctype_digit($name)) {
-			$message = "Service '$name'" . ($type ? " (type of $type)" : '') . ': ';
-		} elseif ($type) {
-			$message = "Service of type $type: ";
-		} elseif ($def instanceof Definitions\ServiceDefinition && $def->getEntity()) {
-			$message = 'Service (' . $this->entityToString($def->getEntity()) . '): ';
-		} else {
-			$message = '';
+		if ($tmp = $def->getType()) {
+			$message = str_replace("$tmp::", '', $message);
 		}
-		$message .= $type
-			? str_replace("$type::", '', $e->getMessage())
-			: $e->getMessage();
+		$message = $def->getDescriptiveName() . "\n" . $message;
 
 		return $e instanceof ServiceCreationException
 			? $e->setMessage($message)
@@ -439,25 +430,26 @@ private function completeException(\Exception $e, Definition $def): ServiceCreat
 
 	private function entityToString($entity): string
 	{
-		$referenceToText = function (Reference $ref): string {
+		$referenceToText = function (Reference $ref): ?string {
 			return $ref->isSelf() && $this->currentService
-				? '@' . $this->currentService->getName()
+				? null
 				: '@' . $ref->getValue();
 		};
+
 		if (is_string($entity)) {
 			return $entity . '::__construct()';
+
 		} elseif ($entity instanceof Reference) {
-			$entity = $referenceToText($entity);
+			return $referenceToText($entity);
+
 		} elseif (is_array($entity)) {
 			if (strpos($entity[1], '$') === false) {
 				$entity[1] .= '()';
 			}
 			if ($entity[0] instanceof Reference) {
 				$entity[0] = $referenceToText($entity[0]);
-			} elseif (!is_string($entity[0])) {
-				return $entity[1];
 			}
-			return implode('::', $entity);
+			return is_string($entity[0]) ? implode('::', $entity) : $entity[1];
 		}
 		return (string) $entity;
 	}

tests/DI/Compiler.configOverride.phpt

@@ -59,4 +59,5 @@ $compiler->addConfig([
 Assert::exception(function () use ($compiler, $class) {
 	$compiler->setClassName($class)
 		->compile();
-}, DI\InvalidConfigurationException::class, "Service 's3': missing original definition for alteration.");
+}, DI\InvalidConfigurationException::class, "[Service 's3']
+Missing original definition for alteration.");

tests/DI/Compiler.extensionOverride.errors.phpt

@@ -21,4 +21,5 @@ services:
 	bad:
 		alteration: yes
 	');
-}, Nette\DI\InvalidConfigurationException::class, "Service 'bad': missing original definition for alteration.");
+}, Nette\DI\InvalidConfigurationException::class, "[Service 'bad']
+Missing original definition for alteration.");

tests/DI/Compiler.functions.phpt

@@ -85,4 +85,5 @@ Assert::exception(function () {
 	services:
 		- Service(bool(123, 10))
 	');
-}, Nette\InvalidStateException::class, 'Service of type Service: Function bool() expects at most 1 parameter, 2 given. (used in __construct())');
+}, Nette\InvalidStateException::class, '[Service of type Service]
+Function bool() expects at most 1 parameter, 2 given. (used in __construct())');

tests/DI/Compiler.generatedFactory.phpt

@@ -294,7 +294,8 @@ Assert::exception(function () {
 		->getResultDefinition()
 			->setFactory('Bad1');
 	$builder->complete();
-}, Nette\InvalidStateException::class, "Service 'one' (type of Bad2): Type hint for \$bar in create() doesn't match type hint in Bad1 constructor.");
+}, Nette\InvalidStateException::class, "[Service 'one' of type Bad2]
+Type hint for \$bar in create() doesn't match type hint in Bad1 constructor.");
 
 
 
@@ -317,7 +318,8 @@ Assert::exception(function () {
 		->getResultDefinition()
 			->setFactory('Bad3');
 	$builder->complete();
-}, Nette\InvalidStateException::class, "Service 'one' (type of Bad4): Unused parameter \$baz when implementing method create(), did you mean \$bar?");
+}, Nette\InvalidStateException::class, "[Service 'one' of type Bad4]
+Unused parameter \$baz when implementing method create(), did you mean \$bar?");
 
 
 
@@ -340,7 +342,8 @@ Assert::exception(function () {
 		->getResultDefinition()
 			->setFactory('Bad5');
 	$builder->complete();
-}, Nette\InvalidStateException::class, "Service 'one' (type of Bad6): Unused parameter \$baz when implementing method create().");
+}, Nette\InvalidStateException::class, "[Service 'one' of type Bad6]
+Unused parameter \$baz when implementing method create().");
 
 
 

tests/DI/Compiler.missingDefinition.phpt

@@ -14,12 +14,14 @@ Assert::throws(function () {
 	services:
 		-
 	');
-}, Nette\InvalidStateException::class, 'Factory and type are missing in definition of service.');
+}, Nette\InvalidStateException::class, '[Service ?]
+Factory and type are missing in definition of service.');
 
 
 Assert::throws(function () {
 	createContainer(new DI\Compiler, '
 	services:
 		foo:
 	');
-}, Nette\InvalidStateException::class, "Service 'foo': Factory and type are missing in definition of service.");
+}, Nette\InvalidStateException::class, "[Service 'foo']
+Factory and type are missing in definition of service.");

tests/DI/ContainerBuilder.autowiring.novalue.phpt

@@ -24,7 +24,8 @@ Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('foo')->setType('Foo');
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'foo' (type of Foo): Parameter \$x in __construct() has no class type hint and no default value, so its value must be specified.");
+}, Nette\DI\ServiceCreationException::class, "[Service 'foo' of type Foo]
+Parameter \$x in __construct() has no class type hint and no default value, so its value must be specified.");
 
 
 class Bar
@@ -38,7 +39,8 @@ Assert::exception(function () {
 	$builder = new DI\ContainerBuilder;
 	$builder->addDefinition('foo')->setType('Bar');
 	$container = createContainer($builder);
-}, Nette\DI\ServiceCreationException::class, "Service 'foo' (type of Bar): Parameter \$x in __construct() has no class type hint and no default value, so its value must be specified.");
+}, Nette\DI\ServiceCreationException::class, "[Service 'foo' of type Bar]
+Parameter \$x in __construct() has no class type hint and no default value, so its value must be specified.");
 
 
 class Bar2

tests/DI/ContainerBuilder.error.phpt

@@ -20,7 +20,8 @@ $builder->addDefinition('one')
 
 Assert::exception(function () use ($builder) {
 	$builder->complete();
-}, Nette\InvalidStateException::class, "Service 'one' (type of stdClass): Expected function, method or property name, '1234' given.");
+}, Nette\InvalidStateException::class, "[Service 'one' of type stdClass]
+Expected function, method or property name, '1234' given.");
 
 
 
@@ -43,4 +44,5 @@ $builder->addDefinition('one')
 
 Assert::exception(function () use ($builder) {
 	$builder->complete();
-}, Nette\InvalidStateException::class, "Service 'one' (type of stdClass): Missing argument for \$prop[].");
+}, Nette\InvalidStateException::class, "[Service 'one' of type stdClass]
+Missing argument for \$prop[].");