Skip to content

Commit 222274f

Browse files
Merge branch '4.4'
* 4.4: (28 commits) fix merge [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations ...
2 parents 029f420 + a8d09b4 commit 222274f

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323

2424
class DaoAuthenticationProviderTest extends TestCase
2525
{
26+
/**
27+
* @group legacy
28+
*/
2629
public function testRetrieveUserWhenProviderDoesNotReturnAnUserInterface()
2730
{
2831
$this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');

Tests/Authentication/Provider/UserAuthenticationProviderTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ public function testAuthenticateWhenUsernameIsNotFoundAndHideIsTrue()
6161
$provider->authenticate($this->getSupportedToken());
6262
}
6363

64+
/**
65+
* @group legacy
66+
*/
6467
public function testAuthenticateWhenProviderDoesNotReturnAnUserInterface()
6568
{
6669
$this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');

Tests/Authorization/TraceableAccessDecisionManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public function testAccessDecisionManagerCalledByVoter()
233233
->method('vote')
234234
->willReturnCallback(function (TokenInterface $token, $subject, array $attributes) use ($sut, $voter3) {
235235
if (\in_array('attr2', $attributes) && $subject) {
236-
$vote = $sut->decide($token, $attributes);
236+
$vote = $sut->decide($token, $attributes) ? VoterInterface::ACCESS_GRANTED : VoterInterface::ACCESS_DENIED;
237237
} else {
238238
$vote = VoterInterface::ACCESS_ABSTAIN;
239239
}

0 commit comments

Comments
 (0)