Resolver: only optional parameters are autowired with default value (…

…BC break) [WIP] TODO: nullable unknown class
nette · Apr 20, 2022 · 7f04701 · 7f04701
1 parent 986f010
commit 7f04701
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/DI/Resolver.php b/src/DI/Resolver.php
@@ -607,15 +607,7 @@ private static function autowireArgument(\ReflectionParameter $parameter, callab
 		) {
 			return $getter($itemType, false);
 
-		} elseif (
-			($type && $parameter->allowsNull())
-			|| $parameter->isOptional()
-			|| $parameter->isDefaultValueAvailable()
-		) {
-			// !optional + defaultAvailable, !optional + !defaultAvailable since 8.1.0 = func($a = null, $b)
-			// optional + !defaultAvailable, optional + defaultAvailable since 8.0.0 = i.e. Exception::__construct, mysqli::mysqli, ...
-			// optional + !defaultAvailable = variadics
-			// in other cases the optional and defaultAvailable are identical
+		} elseif ($parameter->isOptional()) {
 			return null;
 
 		} else {

diff --git a/tests/DI/Resolver.autowireArguments.errors.phpt b/tests/DI/Resolver.autowireArguments.errors.phpt
@@ -66,13 +66,13 @@ Assert::error(function () {
 
 
 // nullable scalar
-Assert::error(function () {
+Assert::exception(function () {
 	Resolver::autowireArguments(
 		new ReflectionFunction(function (?int $arg) {}),
 		[],
 		fn($type) => $type === Test::class ? new Test : null,
 	);
-}, E_USER_DEPRECATED, 'The parameter $arg in {closure}() should have a declared value in the configuration.');
+}, Nette\DI\ServiceCreationException::class, 'Parameter $arg in {closure}() has union type and no default value, so its value must be specified.');
 
 
 // union
@@ -86,13 +86,13 @@ Assert::exception(function () {
 
 
 // nullable union
-Assert::error(function () {
+Assert::exception(function () {
 	Resolver::autowireArguments(
 		new ReflectionFunction(function (stdClass|Test|null $x) {}),
 		[],
 		function () {},
 	);
-}, E_USER_DEPRECATED, 'The parameter $x in {closure}() should have a declared value in the configuration.');
+}, Nette\DI\ServiceCreationException::class, 'Parameter $x in {closure}() has union type and no default value, so its value must be specified.');
 
 
 // bad variadics (this is actually what PHP allows)