Skip to content

Commit c44504c

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [SecurityHttp] Fix incompatibility with 6.0 [SecurityGuard] Fix incompatibility with 6.0 [SecurityBundle] Fix incompatibility with 6.0 [FrameworkBundle] Fix incompatibility with 6.0 [SecurityHttp] Fix incompatibility with 6.0 [PasswordHasher] Fix incompatibility with 6.0 [MonologBridge] Fix incompatibility with 6.0 [Security] Minor fixes [Security] Fix wrong cache directive when using the new PUBLIC_ACCESS attribute
2 parents 93428e8 + 8e5d0d1 commit c44504c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Fixtures/TestLegacyPasswordAuthenticatedUser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getRoles(): array
3535
return $this->roles;
3636
}
3737

38-
public function eraseCredentials()
38+
public function eraseCredentials(): void
3939
{
4040
// Do nothing
4141
return;

Tests/Hasher/UserPasswordHasherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function testNeedsRehash()
125125

126126
$passwordHasher = new UserPasswordHasher($mockPasswordHasherFactory);
127127

128-
\Closure::bind(function () use ($passwordHasher) { $this->password = $passwordHasher->hashPassword($this, 'foo', 'salt'); }, $user, User::class)();
128+
\Closure::bind(function () use ($passwordHasher) { $this->password = $passwordHasher->hashPassword($this, 'foo', 'salt'); }, $user, class_exists(User::class) ? User::class : InMemoryUser::class)();
129129
$this->assertFalse($passwordHasher->needsRehash($user));
130130
$this->assertTrue($passwordHasher->needsRehash($user));
131131
$this->assertFalse($passwordHasher->needsRehash($user));

0 commit comments

Comments
 (0)