Resolver: only optional parameters are autowired with default value (BC break)

Author: dg

src/DI/Resolver.php

@@ -498,9 +498,7 @@ public static function autowireArguments(
 				$res[$num] = self::autowireArgument($param, $getter);
 			}
 
-			$optCount += $param->isOptional() && $res[$num] === ($param->isDefaultValueAvailable() ? Reflection::getParameterDefaultValue($param) : null)
-				? 1
-				: 0;
+			$optCount += $param->isOptional() && $res[$num] === Reflection::getParameterDefaultValue($param) ? 1 : 0;
 		}
 
 		// extra parameters
@@ -573,27 +571,8 @@ 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
-			$default = $parameter->isDefaultValueAvailable()
-				? Reflection::getParameterDefaultValue($parameter)
-				: null;
-
-			if (!$parameter->isOptional()) {
-				trigger_error(sprintf(
-					'The parameter %s should have a declared value in the configuration. Value %s is currently used.',
-					$desc,
-					var_export($default, true)
-				), E_USER_DEPRECATED);
-			}
-			return $default;
+		} elseif ($parameter->isOptional()) {
+			return Reflection::getParameterDefaultValue($parameter);
 
 		} else {
 			throw new ServiceCreationException(sprintf(

tests/DI/Resolver.autowireArguments.phpt

@@ -45,18 +45,18 @@ Assert::equal(
 	Resolver::autowireArguments(new ReflectionMethod(Test::class, 'method'), [], fn($type) => $type === Test::class ? new Test : null),
 );
 
-Assert::error(function () {
+Assert::exception(function () {
 	Resolver::autowireArguments(new ReflectionMethod(Test::class, 'methodNullable'), [], fn($type) => $type === Test::class ? new Test : null);
-}, E_USER_DEPRECATED, 'The parameter $nullable2 in Test::methodNullable() should have a declared value in the configuration. Value NULL is currently used.');
+}, Nette\DI\ServiceCreationException::class, 'Parameter $nullable2 in Test::methodNullable() has union type and no default value, so its value must be specified.');
 
 
 Assert::exception(function () {
 	Resolver::autowireArguments(new ReflectionMethod('Test', 'methodUnion'), [], function () {});
 }, Nette\InvalidStateException::class, 'Parameter $self in Test::methodUnion() has union type and no default value, so its value must be specified.');
 
-Assert::error(function () {
+Assert::exception(function () {
 	Resolver::autowireArguments(new ReflectionMethod(Test::class, 'methodUnionNullable'), [], function () {});
-}, E_USER_DEPRECATED, 'The parameter $nullable in Test::methodUnionNullable() should have a declared value in the configuration. Value NULL is currently used.');
+}, Nette\DI\ServiceCreationException::class, 'Parameter $nullable in Test::methodUnionNullable() has union type and no default value, so its value must be specified.');
 
 Assert::same(
 	[],