Merge branch '6.4' into 7.2

* 6.4:
  clarify what the tested code is expected to do

Author: xabbuh

Tests/EventListener/CsrfProtectionListenerTest.php

@@ -50,10 +50,11 @@ public function testValidCsrfToken()
             ->with(new CsrfToken('authenticator_token_id', 'abc123'))
             ->willReturn(true);
 
-        $event = $this->createEvent($this->createPassport(new CsrfTokenBadge('authenticator_token_id', 'abc123')));
+        $badge = new CsrfTokenBadge('authenticator_token_id', 'abc123');
+        $event = $this->createEvent($this->createPassport($badge));
         $this->listener->checkPassport($event);
 
-        $this->expectNotToPerformAssertions();
+        $this->assertTrue($badge->isResolved());
     }
 
     public function testInvalidCsrfToken()