Merge branch '5.0'
* 5.0: fix merge
This commit is contained in:
commit
670e601d19
@ -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
|
||||
|
Reference in New Issue
Block a user