Skip to content

[DoctrineBridge] Make EntityUserProviders pass attributes to their loader #61825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Sep 24, 2025
Merged

[DoctrineBridge] Make EntityUserProviders pass attributes to their loader #61825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ public function __construct(
) {
}

public function loadUserByIdentifier(string $identifier): UserInterface
/**
* @param ?array $attributes
*/
public function loadUserByIdentifier(string $identifier/* , ?array $attributes = null */): UserInterface
{
$repository = $this->getRepository();
if (null !== $this->property) {
Expand All @@ -57,7 +60,11 @@ public function loadUserByIdentifier(string $identifier): UserInterface
throw new \InvalidArgumentException(\sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, get_debug_type($repository)));
}

$user = $repository->loadUserByIdentifier($identifier);
if (null === $attributes = \func_num_args() > 1 ? func_get_arg(1) : null) {
$user = $repository->loadUserByIdentifier($identifier);
} else {
$user = $repository->loadUserByIdentifier($identifier, $attributes);
}
}

if (null === $user) {
Expand Down
18 changes: 18 additions & 0 deletions src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,24 @@ public function testLoadUserByIdentifierShouldLoadUserWhenProperInterfaceProvide
$provider->loadUserByIdentifier('name');
}

public function testLoadUserByIdentifierShouldPassAttributesToTheUserLoader()
{
$repository = $this->createMock(UserLoaderRepository::class);
$repository->expects($this->once())
->method('loadUserByIdentifier')
->with('name', ['foo' => 'bar'])
->willReturn(
$this->createMock(UserInterface::class)
);

$provider = new EntityUserProvider(
$this->getManager($this->getObjectManager($repository)),
'Symfony\Bridge\Doctrine\Tests\Fixtures\User'
);

$provider->loadUserByIdentifier('name', ['foo' => 'bar']);
}

public function testLoadUserByIdentifierShouldDeclineInvalidInterface()
{
$repository = $this->createMock(ObjectRepository::class);
Expand Down
Loading