PresenterComponentReflection::combineArgs() throws exception when parameter has scalar type hint, no default value and argument is missing

Author: dg

src/Application/UI/PresenterComponentReflection.php

@@ -119,20 +119,30 @@ public static function combineArgs(\ReflectionFunctionAbstract $method, $args)
 		$res = [];
 		foreach ($method->getParameters() as $i => $param) {
 			$name = $param->getName();
-			if (!isset($args[$name]) && $param->isDefaultValueAvailable()) {
-				$res[$i] = $param->getDefaultValue();
-			} else {
-				$res[$i] = $arg = isset($args[$name]) ? $args[$name] : NULL;
-				list($type, $isClass) = self::getParameterType($param);
+			list($type, $isClass) = self::getParameterType($param);
+			if (isset($args[$name])) {
+				$res[$i] = $args[$name];
 				if (!self::convertType($res[$i], $type, $isClass)) {
 					throw new BadRequestException(sprintf(
 						'Argument $%s passed to %s() must be %s, %s given.',
 						$name,
 						($method instanceof \ReflectionMethod ? $method->getDeclaringClass()->getName() . '::' : '') . $method->getName(),
 						$type === 'NULL' ? 'scalar' : $type,
-						is_object($arg) ? get_class($arg) : gettype($arg)
+						is_object($args[$name]) ? get_class($args[$name]) : gettype($args[$name])
 					));
 				}
+			} elseif ($param->isDefaultValueAvailable()) {
+				$res[$i] = $param->getDefaultValue();
+			} elseif ($type === 'array') {
+				$res[$i] = [];
+			} elseif ($type === 'NULL') {
+				$res[$i] = NULL;
+			} else {
+				throw new BadRequestException(sprintf(
+					'Missing parameter $%s required by %s()',
+					$name,
+					($method instanceof \ReflectionMethod ? $method->getDeclaringClass()->getName() . '::' : '') . $method->getName()
+				));
 			}
 		}
 		return $res;

tests/UI/PresenterComponentReflection.combineArgs.php7.phpt

@@ -60,15 +60,21 @@ test(function () {
 test(function () {
 	$method = new ReflectionMethod('MyPresenter', 'hints');
 
-	Assert::same([0, FALSE, '', []], Reflection::combineArgs($method, []));
-	Assert::same([0, FALSE, '', []], Reflection::combineArgs($method, ['int' => NULL, 'bool' => NULL, 'str' => NULL, 'arr' => NULL]));
 	Assert::same([1, TRUE, 'abc', [1]], Reflection::combineArgs($method, ['int' => '1', 'bool' => '1', 'str' => 'abc', 'arr' => [1]]));
-	Assert::same([0, FALSE, '', []], Reflection::combineArgs($method, ['int' => 0, 'bool' => FALSE, 'str' => '', 'arr' => []]));
+	Assert::same([0, FALSE, '', []], Reflection::combineArgs($method, ['int' => 0, 'bool' => FALSE, 'str' => ''])); // missing 'arr'
+
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, []);
+	}, BadRequestException::class, 'Missing parameter $int required by MyPresenter::hints()');
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['int' => '']);
 	}, BadRequestException::class, 'Argument $int passed to MyPresenter::hints() must be int, string given.');
 
+	Assert::exception(function () use ($method) {
+		Reflection::combineArgs($method, ['int' => NULL]);
+	}, BadRequestException::class, 'Missing parameter $int required by MyPresenter::hints()');
+
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['int' => new stdClass]);
 	}, BadRequestException::class, 'Argument $int passed to MyPresenter::hints() must be int, stdClass given.');
@@ -184,11 +190,11 @@ test(function () {
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, []);
-	}, BadRequestException::class, 'Argument $req passed to MyPresenter::objects() must be stdClass, NULL given.');
+	}, BadRequestException::class, 'Missing parameter $req required by MyPresenter::objects()');
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['req' => NULL, 'opt' => NULL]);
-	}, BadRequestException::class, 'Argument $req passed to MyPresenter::objects() must be stdClass, NULL given.');
+	}, BadRequestException::class, 'Missing parameter $req required by MyPresenter::objects()');
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['req' => $method, 'opt' => NULL]);

tests/UI/PresenterComponentReflection.combineArgs.phpt

@@ -72,11 +72,11 @@ test(function () {
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, []);
-	}, BadRequestException::class, 'Argument $req passed to MyPresenter::objects() must be stdClass, NULL given.');
+	}, BadRequestException::class, 'Missing parameter $req required by MyPresenter::objects()');
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['req' => NULL, 'opt' => NULL]);
-	}, BadRequestException::class, 'Argument $req passed to MyPresenter::objects() must be stdClass, NULL given.');
+	}, BadRequestException::class, 'Missing parameter $req required by MyPresenter::objects()');
 
 	Assert::exception(function () use ($method) {
 		Reflection::combineArgs($method, ['req' => $method, 'opt' => NULL]);