summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--app/Auth/Ldap.php1
-rw-r--r--tests/units/Auth/LdapTest.php10
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 78f204c6..2263c4fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ before_script:
- phpenv config-add tests/php.ini
- composer install
- wget https://phar.phpunit.de/phpunit.phar
+ - php -i
script:
- php phpunit.phar -c tests/units.$DB.xml \ No newline at end of file
diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php
index e46d9b81..262c5cd7 100644
--- a/app/Auth/Ldap.php
+++ b/app/Auth/Ldap.php
@@ -129,7 +129,6 @@ class Ldap extends Base
$this->logger->error('Unable to connect to the LDAP server: "'.LDAP_SERVER.'"');
return false;
}
-
ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
ldap_set_option($ldap, LDAP_OPT_NETWORK_TIMEOUT, 1);
diff --git a/tests/units/Auth/LdapTest.php b/tests/units/Auth/LdapTest.php
index e861be98..8d470d88 100644
--- a/tests/units/Auth/LdapTest.php
+++ b/tests/units/Auth/LdapTest.php
@@ -51,7 +51,7 @@ class LdapTest extends \Base
$this->equalTo('my_ldap_server'),
$this->equalTo(389)
)
- ->willReturn(true);
+ ->will($this->returnValue('my_ldap_resource'));
$ldap = new Ldap($this->container);
$this->assertNotFalse($ldap->connect());
@@ -66,7 +66,7 @@ class LdapTest extends \Base
$this->equalTo('my_ldap_server'),
$this->equalTo(389)
)
- ->willReturn(false);
+ ->will($this->returnValue(false));
$ldap = new Ldap($this->container);
$this->assertFalse($ldap->connect());
@@ -82,7 +82,7 @@ class LdapTest extends \Base
$this->equalTo(null),
$this->equalTo(null)
)
- ->willReturn(true);
+ ->will($this->returnValue(true));
$ldap = new Ldap($this->container);
$this->assertTrue($ldap->bind('my_ldap_connection', 'my_user', 'my_password', 'anonymous'));
@@ -98,7 +98,7 @@ class LdapTest extends \Base
$this->equalTo('uid=my_user'),
$this->equalTo('my_password')
)
- ->willReturn(true);
+ ->will($this->returnValue(true));
$ldap = new Ldap($this->container);
$this->assertTrue($ldap->bind('my_ldap_connection', 'my_user', 'my_password', 'user', 'uid=%s', 'something'));
@@ -114,7 +114,7 @@ class LdapTest extends \Base
$this->equalTo('someone'),
$this->equalTo('something')
)
- ->willReturn(true);
+ ->will($this->returnValue(true));
$ldap = new Ldap($this->container);
$this->assertTrue($ldap->bind('my_ldap_connection', 'my_user', 'my_password', 'proxy', 'someone', 'something'));