symfony
diff --git a/‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+60Lines changed: 60 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+60Lines changed: 60 additions & 0 deletions
@@ -72,6 +72,10 @@ public function getArguments(Request $request, callable $controller, \Reflection
                     }
 
                     $argumentValueResolvers = [$this->namedResolvers->get($resolverName)];
+
+                    if ($this->namedResolvers->has(DefaultValueResolver::class) && !$argumentValueResolvers[0] instanceof DefaultValueResolver) {
+                        $argumentValueResolvers[] = $this->namedResolvers->get(DefaultValueResolver::class);
+                    }
                 }
             }
 
 
@@ -22,7 +22,9 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactoryInterface;
 use Symfony\Component\HttpKernel\Exception\ResolverNotFoundException;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingSession;
@@ -296,6 +298,56 @@ public function testTargetedResolver()
         $this->assertSame([1], $resolver->getArguments($request, $controller));
     }
 
+    public function testTargetedResolverWithDefaultValue()
+    {
+        $resolver = self::getResolver([], [
+            RequestAttributeValueResolver::class => new RequestAttributeValueResolver(),
+            DefaultValueResolver::class => new DefaultValueResolver(),
+        ]);
+
+        $request = Request::create('/');
+        $controller = $this->controllerTargetingResolverWithDefaultValue(...);
+
+        $this->assertSame([2], $resolver->getArguments($request, $controller));
+    }
+
+    public function testTargetedResolverWithNullableValue()
+    {
+        $resolver = self::getResolver([], [
+            RequestAttributeValueResolver::class => new RequestAttributeValueResolver(),
+            DefaultValueResolver::class => new DefaultValueResolver(),
+        ]);
+
+        $request = Request::create('/');
+        $controller = $this->controllerTargetingResolverWithNullableValue(...);
+
+        $this->assertSame([null], $resolver->getArguments($request, $controller));
+    }
+
+    public function testDefaultValueResolverIsNotAddedIfAlreadyPinned()
+    {
+        $argumentMetadata = $this->createMock(ArgumentMetadata::class);
+        $argumentMetadata->expects($this->once())->method('getAttributesOfType')->willReturn([new ValueResolver(DefaultValueResolver::class)]);
+        $argumentMetadata->expects($this->once())->method('hasDefaultValue')->willReturn(false);
+        $argumentMetadata->expects($this->once())->method('getType')->willReturn(\stdClass::class);
+        $argumentMetadata->expects($this->once())->method('isNullable')->willReturn(false);
+
+        $argumentMetadataFactory = $this->createMock(ArgumentMetadataFactoryInterface::class);
+        $argumentMetadataFactory->method('createArgumentMetadata')->willReturn([$argumentMetadata]);
+
+        $resolver = new ArgumentResolver(
+            $argumentMetadataFactory,
+            [],
+            new ServiceLocator(array_map(fn ($resolver) => fn () => $resolver, [DefaultValueResolver::class => new DefaultValueResolver()]))
+        );
+
+        $request = Request::create('/');
+
+        $this->expectException(\RuntimeException::class);
+
+        $resolver->getArguments($request, function () {});
+    }
+
     public function testDisabledResolver()
     {
         $resolver = self::getResolver(namedResolvers: []);
@@ -373,6 +425,14 @@ public function controllerTargetingResolver(#[ValueResolver(DefaultValueResolver
     {
     }
 
+    public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(RequestAttributeValueResolver::class)] int $foo = 2)
+    {
+    }
+
+    public function controllerTargetingResolverWithNullableValue(#[ValueResolver(RequestAttributeValueResolver::class)] ?int $foo)
+    {
+    }
+
     public function controllerDisablingResolver(#[ValueResolver(RequestAttributeValueResolver::class, disabled: true)] int $foo = 1)
     {
     }
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ public function getArguments(Request $request, callable $controller, \Reflection`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`$argumentValueResolvers = [$this->namedResolvers->get($resolverName)];`
	`75`	`+`
	`76`	`+ if ($this->namedResolvers->has(DefaultValueResolver::class) && !$argumentValueResolvers[0] instanceof DefaultValueResolver) {`
	`77`	`+ $argumentValueResolvers[] = $this->namedResolvers->get(DefaultValueResolver::class);`
	`78`	`+ }`
`75`	`79`	`}`
`76`	`80`	`}`
`77`	`81`