added support for union types in arguments and persistent parameters

dg · dg · commit 920b970f1bb0 · 2020-11-04T13:01:43.000+01:00
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
@@ -55,7 +55,7 @@ public function getPersistentParams(string $class = null): array
 				) {
 					$params[$name] = [
 						'def' => $default,
-						'type' => Nette\Utils\Reflection::getPropertyType($rp) ?: gettype($default),
+						'type' => self::getPropertyType($rp, $default),
 						'since' => $isPresenter ? Nette\Utils\Reflection::getPropertyDeclaringClass($rp)->getName() : null,
 					];
 				}
@@ -190,7 +190,21 @@ public static function combineArgs(\ReflectionFunctionAbstract $method, array $a
 	/**
 	 * Non data-loss type conversion.
 	 */
-	public static function convertType(&$val, string $type): bool
+	public static function convertType(&$val, string $types): bool
+	{
+		foreach (explode('|', $types) as $type) {
+			if (self::convertSingleType($val, $type)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Non data-loss type conversion.
+	 */
+	private static function convertSingleType(&$val, string $type): bool
 	{
 		static $builtin = [
 			'string' => 1, 'int' => 1, 'float' => 1, 'bool' => 1, 'array' => 1, 'object' => 1,
@@ -259,12 +273,22 @@ public static function parseAnnotation(\Reflector $ref, string $name): ?array
 
 	public static function getParameterType(\ReflectionParameter $param): string
 	{
-		return $param->hasType()
-			? $param->getType()->getName()
+		$type = $param->getType();
+		return $type
+			? ($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type)
 			: gettype($param->isDefaultValueAvailable() ? $param->getDefaultValue() : null);
 	}
 
 
+	public static function getPropertyType(\ReflectionProperty $prop, $default): string
+	{
+		$type = PHP_VERSION_ID < 70400 ? null : $prop->getType();
+		return $type
+			? ($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type)
+			: gettype($default);
+	}
+
+
 	/**
 	 * Has class specified annotation?
 	 */
diff --git a/tests/UI/ComponentReflection.combineArgs.php80.phpt b/tests/UI/ComponentReflection.combineArgs.php80.phpt
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Test: ComponentReflection::combineArgs()
+ * @phpVersion 8.0
+ */
+
+declare(strict_types=1);
+
+use Nette\Application\UI\ComponentReflection as Reflection;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class MyPresenter
+{
+	public function hintsUnion(int|array $intArray, string|array $strArray)
+	{
+	}
+}
+
+
+test('', function () {
+	$method = new ReflectionMethod('MyPresenter', 'hintsUnion');
+
+	Assert::same([1, 'abc'], Reflection::combineArgs($method, ['intArray' => '1', 'strArray' => 'abc']));
+	Assert::same([[1], [2]], Reflection::combineArgs($method, ['intArray' => [1], 'strArray' => [2]]));
+
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, []);
+	}, Nette\InvalidArgumentException::class, 'Missing parameter $intArray required by MyPresenter::hintsUnion()');
+
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, ['intArray' => '']);
+	}, Nette\InvalidArgumentException::class, 'Argument $intArray passed to MyPresenter::hintsUnion() must be array|int, string given.');
+
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, ['intArray' => null]);
+	}, Nette\InvalidArgumentException::class, 'Missing parameter $intArray required by MyPresenter::hintsUnion()');
+
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, ['intArray' => new stdClass]);
+	}, Nette\InvalidArgumentException::class, 'Argument $intArray passed to MyPresenter::hintsUnion() must be array|int, stdClass given.');
+});
diff --git a/tests/UI/ComponentReflection.convertType.phpt b/tests/UI/ComponentReflection.convertType.phpt
@@ -244,3 +244,21 @@ testIt('stdClass', 1.0);
 testIt('stdClass', 1.2);
 
 testIt('Closure', $var = function () {}, $var);
+
+
+testIt('int|array', null);
+testIt('int|array', [], []);
+testIt('int|array', $obj);
+testIt('int|array', function () {});
+testIt('int|array', '');
+testIt('int|array', 'a');
+testIt('int|array', '1', 1);
+testIt('int|array', '1.0');
+testIt('int|array', '1.1');
+testIt('int|array', '1a');
+testIt('int|array', true, 1);
+testIt('int|array', false, 0);
+testIt('int|array', 0, 0);
+testIt('int|array', 1, 1);
+testIt('int|array', 1.0, 1);
+testIt('int|array', 1.2);
