From 15d2b77632ae54ef9900d6872bc6880da7161f97 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 21 Apr 2020 23:19:23 +0200
Subject: [PATCH] fix merge

---
 .../LdapBindAuthenticationProviderTest.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
index 893c890971..fcc950dbe6 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -111,16 +111,16 @@ class LdapBindAuthenticationProviderTest extends TestCase
         ;
 
         $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 @@ class LdapBindAuthenticationProviderTest extends TestCase
         ;
 
         $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 @@ class LdapBindAuthenticationProviderTest extends TestCase
 
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $ldap
-            ->expects($this->at(1))
+            ->expects($this->at(0))
             ->method('bind')
             ->with('elsa', 'test1234A$');
         $ldap