replaced use of Reflection::getReturnTypes() etc

Author: dg

src/DI/Definitions/AccessorDefinition.php

@@ -11,7 +11,7 @@
 
 use Nette;
 use Nette\DI\ServiceCreationException;
-use Nette\Utils\Reflection;
+use Nette\Utils\Type;
 
 
 /**
@@ -134,7 +134,7 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 
 		$class->addMethod(self::METHOD_GET)
 			->setBody('return $this->container->getService(?);', [$this->reference->getValue()])
-			->setReturnType(Reflection::getReturnType($rm));
+			->setReturnType((string) Type::fromReflection($rm));
 
 		$method->setBody('return new class ($this) ' . $class . ';');
 	}

src/DI/Definitions/FactoryDefinition.php

@@ -12,6 +12,7 @@
 use Nette;
 use Nette\DI\ServiceCreationException;
 use Nette\Utils\Reflection;
+use Nette\Utils\Type;
 
 
 /**
@@ -242,13 +243,11 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 		}
 
 		foreach ($method->getParameters() as $param) {
-			$methodHint = Reflection::getParameterTypes($param);
+			$methodType = Type::fromReflection($param);
 			if (isset($ctorParams[$param->name])) {
 				$ctorParam = $ctorParams[$param->name];
-				$ctorHint = Reflection::getParameterTypes($ctorParam);
-				if ($methodHint !== $ctorHint
-					&& !is_a((string) reset($methodHint), (string) reset($ctorHint), true)
-				) {
+				$ctorType = Type::fromReflection($ctorParam);
+				if ($ctorType && !$ctorType->allows((string) $methodType)) {
 					throw new ServiceCreationException(sprintf(
 						"Type of \$%s in %s::create() doesn't match type in %s constructor.",
 						$param->name,
@@ -267,10 +266,7 @@ private function completeParameters(Nette\DI\Resolver $resolver): void
 				) . ($hint ? ", did you mean \${$hint}?" : '.'));
 			}
 
-			$paramDef = PHP_VERSION_ID < 80000
-				? ($methodHint && $param->allowsNull() ? '?' : '') . reset($methodHint)
-				: implode('|', $methodHint);
-			$paramDef .= ' ' . $param->name;
+			$paramDef = $methodType . ' ' . $param->name;
 			if ($param->isDefaultValueAvailable()) {
 				$this->parameters[$paramDef] = Reflection::getParameterDefaultValue($param);
 			} else {
@@ -302,7 +298,7 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 		$rm = new \ReflectionMethod($this->getType(), self::METHOD_CREATE);
 		$methodCreate
 			->setParameters($generator->convertParameters($this->parameters))
-			->setReturnType(Reflection::getReturnType($rm) ?: $this->getResultType())
+			->setReturnType((string) (Type::fromReflection($rm) ?? $this->getResultType()))
 			->setBody($body);
 
 		$method->setBody('return new class ($this) ' . $class . ';');

src/DI/Definitions/LocatorDefinition.php

@@ -10,7 +10,6 @@
 namespace Nette\DI\Definitions;
 
 use Nette;
-use Nette\Utils\Reflection;
 
 
 /**
@@ -140,7 +139,7 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 			$nullable = $rm->getReturnType()->allowsNull();
 
 			$methodInner = $class->addMethod($rm->name)
-				->setReturnType(Reflection::getReturnType($rm))
+				->setReturnType((string) Nette\Utils\Type::fromReflection($rm))
 				->setReturnNullable($nullable);
 
 			if (!$name) {

src/DI/DependencyChecker.php

@@ -11,6 +11,7 @@
 
 use Nette;
 use Nette\Utils\Reflection;
+use Nette\Utils\Type;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -121,7 +122,7 @@ class_uses($name),
 						$name,
 						$prop->name,
 						$prop->getDocComment(),
-						Reflection::getPropertyTypes($prop),
+						(string) Type::fromReflection($prop),
 						PHP_VERSION_ID >= 80000 ? count($prop->getAttributes(Attributes\Inject::class)) : null,
 					];
 				}
@@ -133,7 +134,7 @@ class_uses($name),
 						$method->name,
 						$method->getDocComment(),
 						self::hashParameters($method),
-						Reflection::getReturnTypes($method),
+						(string) Type::fromReflection($method),
 					];
 				}
 			}
@@ -157,7 +158,7 @@ class_uses($name),
 				$uses,
 				$method->getDocComment(),
 				self::hashParameters($method),
-				Reflection::getReturnTypes($method),
+				(string) Type::fromReflection($method),
 			];
 		}
 
@@ -171,7 +172,7 @@ private static function hashParameters(\ReflectionFunctionAbstract $method): arr
 		foreach ($method->getParameters() as $param) {
 			$res[] = [
 				$param->name,
-				Reflection::getParameterTypes($param),
+				(string) Type::fromReflection($param),
 				$param->isVariadic(),
 				$param->isDefaultValueAvailable()
 					? [Reflection::getParameterDefaultValue($param)]

src/DI/Resolver.php

@@ -561,53 +561,52 @@ public static function autowireArguments(
 	 */
 	private static function autowireArgument(\ReflectionParameter $parameter, callable $getter)
 	{
+		$method = $parameter->getDeclaringFunction();
 		$desc = Reflection::toString($parameter);
-		if ($parameter->getType() instanceof \ReflectionIntersectionType) {
+		$type = Nette\Utils\Type::fromReflection($parameter);
+
+		if ($type && $type->isIntersection()) {
 			throw new ServiceCreationException(sprintf(
 				'Parameter %s has intersection type, so its value must be specified.',
 				$desc
 			));
-		}
-
-		$types = array_diff(Reflection::getParameterTypes($parameter), ['null']);
-		$type = count($types) === 1 ? reset($types) : null;
-		$method = $parameter->getDeclaringFunction();
 
-		if ($type && !Reflection::isBuiltinType($type)) {
+		} elseif ($type && $type->isClass()) {
+			$class = $type->getSingleName();
 			try {
-				$res = $getter($type, true);
+				$res = $getter($class, true);
 			} catch (MissingServiceException $e) {
 				$res = null;
 			} catch (ServiceCreationException $e) {
 				throw new ServiceCreationException("{$e->getMessage()} (required by $desc)", 0, $e);
 			}
 			if ($res !== null || $parameter->allowsNull()) {
 				return $res;
-			} elseif (class_exists($type) || interface_exists($type)) {
+			} elseif (class_exists($class) || interface_exists($class)) {
 				throw new ServiceCreationException(sprintf(
 					'Service of type %s required by %s not found. Did you add it to configuration file?',
-					$type,
+					$class,
 					$desc
 				));
 			} else {
 				throw new ServiceCreationException(sprintf(
 					"Class '%s' required by %s not found. Check the parameter type and 'use' statements.",
-					$type,
+					$class,
 					$desc
 				));
 			}
 
 		} elseif (
 			$method instanceof \ReflectionMethod
-			&& $type === 'array'
+			&& $type && $type->getSingleName() === 'array'
 			&& preg_match('#@param[ \t]+([\w\\\\]+)\[\][ \t]+\$' . $parameter->name . '#', (string) $method->getDocComment(), $m)
 			&& ($itemType = Reflection::expandClassName($m[1], $method->getDeclaringClass()))
 			&& (class_exists($itemType) || interface_exists($itemType))
 		) {
 			return $getter($itemType, false);
 
 		} elseif (
-			($types && $parameter->allowsNull())
+			($type && $parameter->allowsNull())
 			|| $parameter->isOptional()
 			|| $parameter->isDefaultValueAvailable()
 		) {
@@ -621,7 +620,7 @@ private static function autowireArgument(\ReflectionParameter $parameter, callab
 			throw new ServiceCreationException(sprintf(
 				'Parameter %s has %s, so its value must be specified.',
 				$desc,
-				count($types) > 1 ? 'union type and no default value' : 'no class type or default value'
+				$type && $type->isUnion() ? 'union type and no default value' : 'no class type or default value'
 			));
 		}
 	}