Merge branch '4.4'

* 4.4:
  bump phpunit-bridge cache-id
  removed unneeded phpdocs
  Use assertStringContainsString when needed
  Use assert assertContainsEquals when needed
  Use assertEqualsWithDelta when required

Author: nicolas-grekas

Authentication/Provider/RememberMeAuthenticationProvider.php

@@ -24,9 +24,8 @@ class RememberMeAuthenticationProvider implements AuthenticationProviderInterfac
     private $providerKey;
 
     /**
-     * @param UserCheckerInterface $userChecker An UserCheckerInterface interface
-     * @param string               $secret      A secret
-     * @param string               $providerKey A provider secret
+     * @param string $secret      A secret
+     * @param string $providerKey A provider secret
      */
     public function __construct(UserCheckerInterface $userChecker, string $secret, string $providerKey)
     {

Authorization/AccessDecisionManagerInterface.php

@@ -23,9 +23,8 @@ interface AccessDecisionManagerInterface
     /**
      * Decides whether the access is possible or not.
      *
-     * @param TokenInterface $token      A TokenInterface instance
-     * @param array          $attributes An array of attributes associated with the method being invoked
-     * @param object         $object     The object to secure
+     * @param array  $attributes An array of attributes associated with the method being invoked
+     * @param object $object     The object to secure
      *
      * @return bool true if the access is granted, false otherwise
      */

Authorization/Voter/VoterInterface.php

@@ -30,9 +30,8 @@ interface VoterInterface
      * This method must return one of the following constants:
      * ACCESS_GRANTED, ACCESS_DENIED, or ACCESS_ABSTAIN.
      *
-     * @param TokenInterface $token      A TokenInterface instance
-     * @param mixed          $subject    The subject to secure
-     * @param array          $attributes An array of attributes associated with the method being invoked
+     * @param mixed $subject    The subject to secure
+     * @param array $attributes An array of attributes associated with the method being invoked
      *
      * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
      */

Tests/Authentication/Provider/UserAuthenticationProviderTest.php

@@ -195,7 +195,7 @@ public function testAuthenticatePreservesOriginalToken()
         $this->assertInstanceOf(SwitchUserToken::class, $authToken);
         $this->assertSame($originalToken, $authToken->getOriginalToken());
         $this->assertSame($user, $authToken->getUser());
-        $this->assertContains('ROLE_FOO', $authToken->getRoleNames(), '', false, false);
+        $this->assertContains('ROLE_FOO', $authToken->getRoleNames());
         $this->assertEquals('foo', $authToken->getCredentials());
         $this->assertEquals(['foo' => 'bar'], $authToken->getAttributes(), '->authenticate() copies token attributes');
     }