fix merge
This commit is contained in:
parent
0ed6cfd412
commit
15d2b77632
@ -111,16 +111,16 @@ class LdapBindAuthenticationProviderTest extends TestCase
|
|||||||
;
|
;
|
||||||
|
|
||||||
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
||||||
|
$ldap
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('bind')
|
||||||
|
->with('elsa', 'test1234A$');
|
||||||
$ldap
|
$ldap
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('escape')
|
->method('escape')
|
||||||
->with('foo', '')
|
->with('foo', '')
|
||||||
->willReturn('foo')
|
->willReturn('foo')
|
||||||
;
|
;
|
||||||
$ldap
|
|
||||||
->expects($this->at(1))
|
|
||||||
->method('bind')
|
|
||||||
->with('elsa', 'test1234A$');
|
|
||||||
$ldap
|
$ldap
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('query')
|
->method('query')
|
||||||
@ -151,16 +151,16 @@ class LdapBindAuthenticationProviderTest extends TestCase
|
|||||||
;
|
;
|
||||||
|
|
||||||
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
||||||
|
$ldap
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('bind')
|
||||||
|
->with('elsa', 'test1234A$');
|
||||||
$ldap
|
$ldap
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('escape')
|
->method('escape')
|
||||||
->with('foo', '')
|
->with('foo', '')
|
||||||
->willReturn('foo')
|
->willReturn('foo')
|
||||||
;
|
;
|
||||||
$ldap
|
|
||||||
->expects($this->at(1))
|
|
||||||
->method('bind')
|
|
||||||
->with('elsa', 'test1234A$');
|
|
||||||
$ldap
|
$ldap
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('query')
|
->method('query')
|
||||||
@ -195,7 +195,7 @@ class LdapBindAuthenticationProviderTest extends TestCase
|
|||||||
|
|
||||||
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
||||||
$ldap
|
$ldap
|
||||||
->expects($this->at(1))
|
->expects($this->at(0))
|
||||||
->method('bind')
|
->method('bind')
|
||||||
->with('elsa', 'test1234A$');
|
->with('elsa', 'test1234A$');
|
||||||
$ldap
|
$ldap
|
||||||
|
Reference in New Issue
Block a user