ComponentReflection::combineArgs() throws InvalidArgumentException instead BadRequestException when incompatible type is object

Author: dg

src/Application/UI/ComponentReflection.php

@@ -125,10 +125,11 @@ public static function combineArgs(\ReflectionFunctionAbstract $method, $args)
 		foreach ($method->getParameters() as $i => $param) {
 			$name = $param->getName();
 			list($type, $isClass) = self::getParameterType($param);
+			$exception = $isClass ? Nette\InvalidArgumentException::class : BadRequestException::class;
 			if (isset($args[$name])) {
 				$res[$i] = $args[$name];
 				if (!self::convertType($res[$i], $type, $isClass)) {
-					throw new BadRequestException(sprintf(
+					throw new $exception(sprintf(
 						'Argument $%s passed to %s() must be %s, %s given.',
 						$name,
 						($method instanceof \ReflectionMethod ? $method->getDeclaringClass()->getName() . '::' : '') . $method->getName(),
@@ -143,7 +144,7 @@ public static function combineArgs(\ReflectionFunctionAbstract $method, $args)
 			} elseif ($type === 'NULL') {
 				$res[$i] = NULL;
 			} else {
-				throw new BadRequestException(sprintf(
+				throw new $exception(sprintf(
 					'Missing parameter $%s required by %s()',
 					$name,
 					($method instanceof \ReflectionMethod ? $method->getDeclaringClass()->getName() . '::' : '') . $method->getName()

tests/UI/ComponentReflection.combineArgs.php7.phpt

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

tests/UI/ComponentReflection.combineArgs.phpt

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