Skip to content

Commit 2a793e0

Browse files
Merge branch '5.4' into 6.0
* 5.4: Add missing return types to tests/internal/final methods Add type to fix 6.0 build
2 parents 931ccfc + 383217f commit 2a793e0

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Tests/Authentication/AuthenticationTrustResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function getCredentials(): mixed
176176
{
177177
}
178178

179-
public function getUser(): string|\Stringable|UserInterface
179+
public function getUser(): UserInterface
180180
{
181181
}
182182

Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,3 @@ public function upgradePassword(PasswordAuthenticatedUserInterface $user, string
354354

355355
public function loadUserByIdentifier(string $identifier): UserInterface;
356356
}
357-
358-
interface DaoAuthenticationProviderTest_UserProvider extends UserProviderInterface
359-
{
360-
public function loadUserByUsername($username): UserInterface;
361-
}

0 commit comments

Comments
 (0)