resolved cooperation with union types

Author: dg

src/DI/Container.php

@@ -76,7 +76,7 @@ public function addService(string $name, $service)
 		}
 
 		$type = $service instanceof \Closure
-			? (($tmp = (new \ReflectionFunction($service))->getReturnType()) ? $tmp->getName() : '')
+			? (string) Nette\Utils\Reflection::getReturnType(new \ReflectionFunction($service))
 			: get_class($service);
 
 		if (!isset($this->methods[self::getMethodName($name)])) {

src/DI/Definitions/FactoryDefinition.php

@@ -230,11 +230,13 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 		}
 
 		foreach ($method->getParameters() as $param) {
-			$methodHint = Reflection::getParameterType($param);
+			$methodHint = Reflection::getParameterTypes($param);
 			if (isset($ctorParams[$param->name])) {
 				$ctorParam = $ctorParams[$param->name];
-				$ctorHint = Reflection::getParameterType($ctorParam);
-				if ($methodHint !== $ctorHint && !is_a($methodHint, (string) $ctorHint, true)) {
+				$ctorHint = Reflection::getParameterTypes($ctorParam);
+				if ($methodHint !== $ctorHint
+					&& !is_a((string) reset($methodHint), (string) reset($ctorHint), true)
+				) {
 					throw new ServiceCreationException("Type hint for \${$param->name} in $interface::create() doesn't match type hint in $class constructor.");
 				}
 				$this->resultDefinition->getFactory()->arguments[$ctorParam->getPosition()] = Nette\DI\ContainerBuilder::literal('$' . $ctorParam->name);
@@ -243,7 +245,11 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 				$hint = Nette\Utils\Helpers::getSuggestion(array_keys($ctorParams), $param->name);
 				throw new ServiceCreationException("Unused parameter \${$param->name} when implementing method $interface::create()" . ($hint ? ", did you mean \${$hint}?" : '.'));
 			}
-			$paramDef = ($methodHint && $param->allowsNull() ? '?' : '') . $methodHint . ' ' . $param->name;
+
+			$methodHint = PHP_VERSION_ID < 80000
+				? ($methodHint && $param->allowsNull() ? '?' : '') . reset($methodHint)
+				: implode('|', $methodHint);
+			$paramDef = $methodHint . ' ' . $param->name;
 			if ($param->isDefaultValueAvailable()) {
 				$this->parameters[$paramDef] = Reflection::getParameterDefaultValue($param);
 			} else {

tests/DI/Container.dynamic.php80.phpt

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Test: Nette\DI\Container dynamic usage.
+ * @phpVersion 8.0
+ */
+
+declare(strict_types=1);
+
+use Nette\DI\Container;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$container = new Container;
+
+// union type
+Assert::exception(function () use ($container) {
+	@$container->addService('six', function (): \stdClass|\Closure {}); // @ triggers service should be defined as "imported"
+	$container->getService('six');
+}, Nette\InvalidStateException::class, 'The {closure}() is not expected to have a union type.');

tests/DI/InjectExtension.getInjectProperties().php80.phpt

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Test: Nette\DI\Extensions\InjectExtension::getInjectProperties()
+ * @phpVersion 8.0
+ */
+
+declare(strict_types=1);
+
+use Nette\DI\Extensions\InjectExtension;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class AClass
+{
+	/** @inject */
+	public AClass|\stdClass $var;
+}
+
+
+Assert::exception(function () {
+	InjectExtension::getInjectProperties(AClass::class);
+}, Nette\InvalidStateException::class, 'The AClass::$var is not expected to have a union type.');

tests/DI/Resolver.autowireArguments.80.phpt

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Test: Nette\DI\Resolver::autowireArguments()
+ * @phpVersion 8.0
+ */
+
+declare(strict_types=1);
+
+use Nette\DI\Resolver;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Test
+{
+	public function methodUnion(\stdClass |self $self)
+	{
+	}
+}
+
+Assert::exception(function () {
+	Resolver::autowireArguments(new ReflectionMethod('Test', 'methodUnion'), [], function () {});
+}, Nette\InvalidStateException::class, 'The $self in Test::methodUnion() is not expected to have a union type.');