Resolver::autowireArguments() throws an exception when combining a na…

…med and positional parameter
nette · Sep 29, 2021 · 4f0cb0b · 4f0cb0b
1 parent 3c615cb
commit 4f0cb0b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/src/DI/Resolver.php b/src/DI/Resolver.php
@@ -519,8 +519,15 @@ public static function autowireArguments(
 		foreach ($method->getParameters() as $num => $param) {
 			$paramName = $param->name;
 			if (!$param->isVariadic() && array_key_exists($paramName, $arguments)) {
+				if (array_key_exists($num, $arguments)) {
+					throw new ServiceCreationException(sprintf(
+						'Named parameter $%s used at the same time as a positional in %s.',
+						$paramName,
+						Reflection::toString($method)
+					));
+				}
 				$res[$num] = $arguments[$paramName];
-				unset($arguments[$paramName], $arguments[$num]);
+				unset($arguments[$paramName]);
 
 			} elseif (array_key_exists($num, $arguments)) {
 				$res[$num] = $arguments[$num];

diff --git a/tests/DI/Compiler.services.factory.phpt b/tests/DI/Compiler.services.factory.phpt
@@ -58,7 +58,7 @@ Assert::type(Ipsum::class, $container->getService('two'));
 Assert::same(1, $container->getService('two')->arg);
 
 Assert::type(Lorem::class, $container->getService('three'));
-Assert::same('Factory::createLorem 5 2', $container->getService('three')->arg);
+Assert::same('Factory::createLorem 1 2', $container->getService('three')->arg);
 
 Assert::type(Lorem::class, $container->getService('four'));
 Assert::same('Factory::createLorem 1', $container->getService('four')->arg);
@@ -74,7 +74,7 @@ Assert::type(Lorem::class, $container->getService('seven'));
 Assert::type(Lorem::class, $container->getService('eight'));
 
 Assert::type(Lorem::class, $container->getService('nine'));
-Assert::same('Factory::createLorem 5 2', $container->getService('nine')->arg);
+Assert::same('Factory::createLorem 1 2', $container->getService('nine')->arg);
 Assert::same([], $container->getService('nine')->foo);
 
 Assert::type(Ipsum::class, $container->getService('referencedService'));

diff --git a/tests/DI/Resolver.autowireArguments.errors.phpt b/tests/DI/Resolver.autowireArguments.errors.phpt
@@ -31,3 +31,13 @@ Assert::exception(function () {
 Assert::exception(function () {
 	Resolver::autowireArguments(new ReflectionFunction(function (int $x) {}), [], function () {});
 }, Nette\DI\ServiceCreationException::class, 'Parameter $x in {closure}() has no class type or default value, so its value must be specified.');
+
+
+Assert::exception(function () {
+	Resolver::autowireArguments(new ReflectionFunction(function (int $x) {}), [10, 'x' => 10], function () {});
+}, Nette\DI\ServiceCreationException::class, 'Named parameter $x used at the same time as a positional in {closure}%a?%.');
+
+
+Assert::exception(function () {
+	Resolver::autowireArguments(new ReflectionFunction(function (...$args) {}), ['args' => []], function () {});
+}, Nette\DI\ServiceCreationException::class, 'Unable to pass specified arguments to {closure}%a?%.');
diff --git a/tests/DI/Resolver.autowireArguments.phpt b/tests/DI/Resolver.autowireArguments.phpt
@@ -38,3 +38,15 @@ Assert::equal(
 		return $type === Test::class ? new Test : null;
 	})
 );
+
+
+// variadics
+Assert::equal(
+	[],
+	Resolver::autowireArguments(new ReflectionFunction(function (...$args) {}), [], function () {})
+);
+
+Assert::equal(
+	[1, 2, 3],
+	Resolver::autowireArguments(new ReflectionFunction(function (...$args) {}), [1, 2, 3], function () {})
+);
diff --git a/tests/DI/files/compiler.services.factory.neon b/tests/DI/files/compiler.services.factory.neon
@@ -25,7 +25,7 @@ services:
 	three:
 		type: Lorem
 		factory: Factory::createLorem
-		arguments: [arg: 5, 1, 2]
+		arguments: [1, 2]
 
 	four:
 		factory: Factory::createLorem(1)