Resolver::autowireArgument() fixed handling of new-initializer with t…

…ypehint [Closes #302]
nette · Dec 14, 2023 · 6c422d0 · 6c422d0
1 parent d2ad016
commit 6c422d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/DI/Resolver.php b/src/DI/Resolver.php
@@ -642,7 +642,7 @@ private static function autowireArgument(\ReflectionParameter $parameter, callab
 				throw new ServiceCreationException("{$e->getMessage()} (required by $desc)", 0, $e);
 			}
 
-			if ($res !== null || $parameter->allowsNull()) {
+			if ($res !== null || $parameter->allowsNull() || $parameter->isOptional()) {
 				return $res;
 			} elseif (class_exists($class) || interface_exists($class)) {
 				throw new ServiceCreationException(sprintf(

diff --git a/tests/DI/Resolver.autowireArguments.81.phpt b/tests/DI/Resolver.autowireArguments.81.phpt
@@ -41,3 +41,13 @@ Assert::same(
 		function () {}
 	),
 );
+
+// object as default with typehint
+Assert::same(
+	['b' => 10],
+	Resolver::autowireArguments(
+		new ReflectionFunction(function (stdClass $a = new stdClass, $b = null) {}),
+		[1 => 10],
+		function () {}
+	),
+);