Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit d9b548e

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Twig+FrameworkBundle] Fix forward compat with Form 2.8 [2.6] Static Code Analysis for Components [Security/Http] Fix test relying on a private property [Serializer] Fix bugs reported in symfony/symfony@b5990be#commitcomment-12301266 Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
2 parents 999b289 + 9aa9f48 commit d9b548e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ public function testHandleWithTokenStorageHavingNoToken()
5454
$authenticationManager
5555
->expects($this->once())
5656
->method('authenticate')
57-
->with(self::logicalAnd(
58-
$this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken'),
59-
$this->attributeEqualTo('secret', 'TheSecret')
60-
))
57+
->with($this->callback(function ($token) {
58+
return 'TheSecret' === $token->getSecret();
59+
}))
6160
->will($this->returnValue($anonymousToken))
6261
;
6362

0 commit comments

Comments
 (0)