diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index 6c485dc6e5450..bc44b9fbf9279 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
7.4
---
+ * Add support for union types with `#[CurrentUser]`
* Deprecate callable firewall listeners, extend `AbstractListener` or implement `FirewallListenerInterface` instead
* Deprecate `AbstractListener::__invoke`
diff --git a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
index f64c167f4898d..347ae7b7a879d 100644
--- a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
+++ b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
@@ -57,6 +57,13 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
return [$user];
}
+ $types = explode('|', $argument->getType());
+ foreach ($types as $type) {
+ if ($user instanceof $type) {
+ return [$user];
+ }
+ }
+
throw new AccessDeniedException(\sprintf('The logged-in user is an instance of "%s" but a user of type "%s" is expected.', $user::class, $argument->getType()));
}
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php b/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php
index 6521c33f72ba1..e6adc96cfda1e 100644
--- a/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php
@@ -21,6 +21,7 @@
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\User\InMemoryUser;
+use Symfony\Component\Security\Core\User\OAuth2User;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Http\Attribute\CurrentUser;
use Symfony\Component\Security\Http\Controller\UserValueResolver;
@@ -109,6 +110,19 @@ public function testResolveSucceedsWithTypedAttribute()
$this->assertSame([$user], $resolver->resolve(Request::create('/'), $metadata));
}
+ public function testResolveSucceedsWithUnionTypedAttribute()
+ {
+ $user = new InMemoryUser('username', 'password');
+ $token = new UsernamePasswordToken($user, 'provider');
+ $tokenStorage = new TokenStorage();
+ $tokenStorage->setToken($token);
+
+ $resolver = new UserValueResolver($tokenStorage);
+ $metadata = new ArgumentMetadata('foo', InMemoryUser::class.'|'.OAuth2User::class, false, false, null, false, [new CurrentUser()]);
+
+ $this->assertSame([$user], $resolver->resolve(Request::create('/'), $metadata));
+ }
+
public function testResolveThrowsAccessDeniedWithWrongUserClass()
{
$user = $this->createMock(UserInterface::class);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy