[HttpKernel] Handle multi-attribute controller arguments

Author: chalasr

Attribute/CurrentUser.php

@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Security\Http\Attribute;
 
-use Symfony\Component\HttpKernel\Attribute\ArgumentInterface;
-
 /**
  * Indicates that a controller argument should receive the current logged user.
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class CurrentUser implements ArgumentInterface
+class CurrentUser
 {
 }

Controller/UserValueResolver.php

@@ -37,7 +37,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
     {
         // with the attribute, the type can be any UserInterface implementation
         // otherwise, the type must be UserInterface
-        if (UserInterface::class !== $argument->getType() && !$argument->getAttribute() instanceof CurrentUser) {
+        if (UserInterface::class !== $argument->getType() && !$argument->getAttributes(CurrentUser::class, ArgumentMetadata::IS_INSTANCEOF)) {
             return false;
         }
 

Tests/Controller/UserValueResolverTest.php

@@ -77,7 +77,8 @@ public function testResolveWithAttribute()
         $tokenStorage->setToken($token);
 
         $resolver = new UserValueResolver($tokenStorage);
-        $metadata = new ArgumentMetadata('foo', null, false, false, null, false, new CurrentUser());
+        $metadata = $this->createMock(ArgumentMetadata::class);
+        $metadata = new ArgumentMetadata('foo', null, false, false, null, false, [new CurrentUser()]);
 
         $this->assertTrue($resolver->supports(Request::create('/'), $metadata));
         $this->assertSame([$user], iterator_to_array($resolver->resolve(Request::create('/'), $metadata)));
@@ -89,7 +90,7 @@ public function testResolveWithAttributeAndNoUser()
         $tokenStorage->setToken(new UsernamePasswordToken('username', 'password', 'provider'));
 
         $resolver = new UserValueResolver($tokenStorage);
-        $metadata = new ArgumentMetadata('foo', null, false, false, null, false, new CurrentUser());
+        $metadata = new ArgumentMetadata('foo', null, false, false, null, false, [new CurrentUser()]);
 
         $this->assertFalse($resolver->supports(Request::create('/'), $metadata));
     }

composer.json

@@ -20,7 +20,7 @@
         "symfony/deprecation-contracts": "^2.1",
         "symfony/security-core": "^5.3",
         "symfony/http-foundation": "^5.2",
-        "symfony/http-kernel": "^5.2",
+        "symfony/http-kernel": "^5.3",
         "symfony/polyfill-php80": "^1.15",
         "symfony/property-access": "^4.4|^5.0"
     },