Merge branch '4.4' into 5.0

* 4.4:
  fix merge

Author: nicolas-grekas

Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php

@@ -111,16 +111,16 @@ public function testQueryForDn()
         ;
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
+        $ldap
+            ->expects($this->at(0))
+            ->method('bind')
+            ->with('elsa', 'test1234A$');
         $ldap
             ->expects($this->once())
             ->method('escape')
             ->with('foo', '')
             ->willReturn('foo')
         ;
-        $ldap
-            ->expects($this->at(1))
-            ->method('bind')
-            ->with('elsa', 'test1234A$');
         $ldap
             ->expects($this->once())
             ->method('query')
@@ -151,16 +151,16 @@ public function testQueryWithUserForDn()
         ;
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
+        $ldap
+            ->expects($this->at(0))
+            ->method('bind')
+            ->with('elsa', 'test1234A$');
         $ldap
             ->expects($this->once())
             ->method('escape')
             ->with('foo', '')
             ->willReturn('foo')
         ;
-        $ldap
-            ->expects($this->at(1))
-            ->method('bind')
-            ->with('elsa', 'test1234A$');
         $ldap
             ->expects($this->once())
             ->method('query')
@@ -195,7 +195,7 @@ public function testEmptyQueryResultShouldThrowAnException()
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $ldap
-            ->expects($this->at(1))
+            ->expects($this->at(0))
             ->method('bind')
             ->with('elsa', 'test1234A$');
         $ldap