Merge branch '4.4' into 5.1

* 4.4:
  stop using deprecated PHPUnit APIs

Author: fabpot

Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

@@ -300,7 +300,7 @@ protected function getSupportedToken()
 
     protected function getProvider($user = null, $userChecker = null, $passwordEncoder = null)
     {
-        $userProvider = $this->getMockBuilder([UserProviderInterface::class, PasswordUpgraderInterface::class])->getMock();
+        $userProvider = $this->getMockBuilder(PasswordUpgraderProvider::class)->getMock();
         if (null !== $user) {
             $userProvider->expects($this->once())
                          ->method('loadUserByUsername')
@@ -353,3 +353,6 @@ public function eraseCredentials()
     {
     }
 }
+interface PasswordUpgraderProvider extends UserProviderInterface, PasswordUpgraderInterface
+{
+}

Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

@@ -112,9 +112,10 @@ public function testQueryForDn()
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $ldap
-            ->expects($this->at(0))
             ->method('bind')
-            ->with('elsa', 'test1234A$');
+            ->withConsecutive(
+                ['elsa', 'test1234A$']
+            );
         $ldap
             ->expects($this->once())
             ->method('escape')
@@ -152,9 +153,10 @@ public function testQueryWithUserForDn()
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $ldap
-            ->expects($this->at(0))
             ->method('bind')
-            ->with('elsa', 'test1234A$');
+            ->withConsecutive(
+                ['elsa', 'test1234A$']
+            );
         $ldap
             ->expects($this->once())
             ->method('escape')
@@ -195,9 +197,10 @@ public function testEmptyQueryResultShouldThrowAnException()
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $ldap
-            ->expects($this->at(0))
             ->method('bind')
-            ->with('elsa', 'test1234A$');
+            ->withConsecutive(
+                ['elsa', 'test1234A$']
+            );
         $ldap
             ->expects($this->once())
             ->method('query')