mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
Updated ldap so extension not required in testing
This commit is contained in:
parent
5c1015d6fc
commit
3a1cda5802
@ -33,6 +33,17 @@ class Ldap
|
|||||||
return ldap_set_option($ldapConnection, $option, $value);
|
return ldap_set_option($ldapConnection, $option, $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the version number for the given ldap connection.
|
||||||
|
* @param $ldapConnection
|
||||||
|
* @param $version
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function setVersion($ldapConnection, $version)
|
||||||
|
{
|
||||||
|
return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search LDAP tree using the provided filter.
|
* Search LDAP tree using the provided filter.
|
||||||
* @param resource $ldapConnection
|
* @param resource $ldapConnection
|
||||||
|
@ -122,7 +122,7 @@ class LdapService
|
|||||||
|
|
||||||
// Set any required options
|
// Set any required options
|
||||||
if ($this->config['version']) {
|
if ($this->config['version']) {
|
||||||
$this->ldap->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $this->config['version']);
|
$this->ldap->setVersion($ldapConnection, $this->config['version']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->ldapConnection = $ldapConnection;
|
$this->ldapConnection = $ldapConnection;
|
||||||
|
@ -22,7 +22,7 @@ class LdapTest extends \TestCase
|
|||||||
public function test_login()
|
public function test_login()
|
||||||
{
|
{
|
||||||
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
||||||
$this->mockLdap->shouldReceive('setOption')->once();
|
$this->mockLdap->shouldReceive('setVersion')->once();
|
||||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
|
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
|
||||||
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
||||||
->andReturn(['count' => 1, 0 => [
|
->andReturn(['count' => 1, 0 => [
|
||||||
@ -49,7 +49,7 @@ class LdapTest extends \TestCase
|
|||||||
public function test_login_works_when_no_uid_provided_by_ldap_server()
|
public function test_login_works_when_no_uid_provided_by_ldap_server()
|
||||||
{
|
{
|
||||||
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
||||||
$this->mockLdap->shouldReceive('setOption')->once();
|
$this->mockLdap->shouldReceive('setVersion')->once();
|
||||||
$ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
|
$ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
|
||||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
||||||
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
||||||
@ -73,7 +73,7 @@ class LdapTest extends \TestCase
|
|||||||
public function test_initial_incorrect_details()
|
public function test_initial_incorrect_details()
|
||||||
{
|
{
|
||||||
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
|
||||||
$this->mockLdap->shouldReceive('setOption')->once();
|
$this->mockLdap->shouldReceive('setVersion')->once();
|
||||||
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
|
||||||
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
|
||||||
->andReturn(['count' => 1, 0 => [
|
->andReturn(['count' => 1, 0 => [
|
||||||
|
Loading…
Reference in New Issue
Block a user