InjectExtension: updated exception messages

nette · Nov 25, 2020 · ad1d29c · ad1d29c
1 parent 78f5212
commit ad1d29c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/DI/Extensions/InjectExtension.php b/src/DI/Extensions/InjectExtension.php
@@ -115,6 +115,9 @@ public static function getInjectProperties(string $class): array
 			if (DI\Helpers::parseAnnotation($rp, 'inject') !== null) {
 				if ($type = Reflection::getPropertyType($rp)) {
 				} elseif ($type = DI\Helpers::parseAnnotation($rp, 'var')) {
+					if (strpos($type, '|') !== false) {
+						throw new Nette\InvalidStateException('The ' . Reflection::toString($rp) . ' is not expected to have a union type.');
+					}
 					$type = Reflection::expandClassName($type, Reflection::getPropertyDeclaringClass($rp));
 				}
 				$res[$name] = $type;
@@ -154,11 +157,11 @@ private static function checkType($class, string $name, ?string $type, $containe
 	{
 		$propName = Reflection::toString(new \ReflectionProperty($class, $name));
 		if (!$type) {
-			throw new Nette\InvalidStateException("Property $propName has no @var annotation.");
+			throw new Nette\InvalidStateException("Property $propName has no type hint.");
 		} elseif (!class_exists($type) && !interface_exists($type)) {
-			throw new Nette\InvalidStateException("Class or interface '$type' used in @var annotation at $propName not found. Check annotation and 'use' statements.");
+			throw new Nette\InvalidStateException("Class or interface '$type' used in type hint at $propName not found. Check type and 'use' statements.");
 		} elseif ($container && !$container->getByType($type, false)) {
-			throw new Nette\DI\MissingServiceException("Service of type $type used in @var annotation at $propName not found. Did you add it to configuration file?");
+			throw new Nette\DI\MissingServiceException("Service of type $type used in type hint at $propName not found. Did you add it to configuration file?");
 		}
 	}
 }
diff --git a/tests/DI/InjectExtension.errors.phpt b/tests/DI/InjectExtension.errors.phpt
@@ -46,7 +46,7 @@ services:
 		factory: ServiceA
 		inject: yes
 ');
-}, InvalidStateException::class, 'Service of type DateTimeImmutable used in @var annotation at ServiceA::$a not found. Did you add it to configuration file?');
+}, InvalidStateException::class, 'Service of type DateTimeImmutable used in type hint at ServiceA::$a not found. Did you add it to configuration file?');
 
 
 Assert::exception(function () use ($compiler) {
@@ -56,7 +56,7 @@ services:
 		factory: ServiceB
 		inject: yes
 ');
-}, InvalidStateException::class, "Class or interface 'Unknown' used in @var annotation at ServiceB::\$a not found. Check annotation and 'use' statements.");
+}, InvalidStateException::class, "Class or interface 'Unknown' used in type hint at ServiceB::\$a not found. Check type and 'use' statements.");
 
 
 Assert::exception(function () use ($compiler) {
@@ -66,4 +66,4 @@ services:
 		factory: ServiceC
 		inject: yes
 ');
-}, InvalidStateException::class, 'Property ServiceC::$a has no @var annotation.');
+}, InvalidStateException::class, 'Property ServiceC::$a has no type hint.');