Merge branch '2.6' into 2.7

* 2.6:
  [2.6] Static Code Analysis for Components
  [Security/Http] Fix test relying on a private property

1 files changed, 3 insertions, 4 deletions

diff --git a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
index dcd672b..3450c1e 100644
--- a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
+++ b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -54,10 +54,9 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
         $authenticationManager
             ->expects($this->once())
             ->method('authenticate')
-            ->with(self::logicalAnd(
-                       $this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken'),
-                       $this->attributeEqualTo('key', 'TheKey')
-            ))
+            ->with($this->callback(function ($token) {
+                return 'TheKey' === $token->getKey();
+            }))
             ->will($this->returnValue($anonymousToken))
         ;