Skip to content

Commit 927a370

Browse files
Merge pull request #2926 from dpfaffenbauer/fix/symfony
[CoreBundle] fix deprecation and issue in ObjectUserProvider and use stable Pimcore 12
2 parents 5d628e1 + b0b8ab8 commit 927a370

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@
174174
"symfony-tests-dir": "tests",
175175
"symfony-assets-install": "relative"
176176
},
177-
"minimum-stability": "dev",
178177
"prefer-stable": true,
179178
"config": {
180179
"sort-packages": true,

src/CoreShop/Bundle/CoreBundle/Security/ObjectUserProvider.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ public function __construct(
3131
) {
3232
}
3333

34-
public function loadUserByUsername(string $username): ?UserInterface
35-
{
36-
return $this->loadUserByIdentifier($username);
37-
}
38-
3934
public function loadUserByIdentifier(string $identifier): UserInterface
4035
{
4136
$user = $this->userRepository->findByLoginIdentifier($identifier);
@@ -47,7 +42,7 @@ public function loadUserByIdentifier(string $identifier): UserInterface
4742
throw new UserNotFoundException(sprintf('User with email address or username "%s" was not found', $identifier));
4843
}
4944

50-
public function refreshUser(UserInterface $user): ?UserInterface
45+
public function refreshUser(UserInterface $user): UserInterface
5146
{
5247
if (!$user instanceof \CoreShop\Component\Core\Model\UserInterface) {
5348
throw new UnsupportedUserException();

0 commit comments

Comments
 (0)