Merge branch '4.0'
* 4.0: fix merge
This commit is contained in:
commit
ca53d3e0fd
@ -120,7 +120,11 @@ trait RedisTrait
|
|||||||
$redis = new $class();
|
$redis = new $class();
|
||||||
|
|
||||||
$initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
|
$initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
|
||||||
|
try {
|
||||||
@$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
|
@$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
|
||||||
|
} catch (\RedisException $e) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
|
||||||
|
}
|
||||||
|
|
||||||
if (@!$redis->isConnected()) {
|
if (@!$redis->isConnected()) {
|
||||||
$e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
|
$e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
|
||||||
|
@ -52,7 +52,7 @@ class LdapBindAuthenticationProviderTest extends TestCase
|
|||||||
public function testNullPasswordShouldThrowAnException()
|
public function testNullPasswordShouldThrowAnException()
|
||||||
{
|
{
|
||||||
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
|
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
|
||||||
$ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapClientInterface')->getMock();
|
$ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapInterface')->getMock();
|
||||||
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
|
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
|
||||||
|
|
||||||
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
|
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
|
||||||
|
Reference in New Issue
Block a user