Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit ca53d3e0fdfc · 2018-04-02T16:36:02.000+02:00
* 4.0:
  fix merge
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -120,7 +120,11 @@ public static function createConnection($dsn, array $options = array())
             $redis = new $class();
 
             $initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
-                @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+                try {
+                    @$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()) {
                     $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -52,7 +52,7 @@ public function testEmptyPasswordShouldThrowAnException()
     public function testNullPasswordShouldThrowAnException()
     {
         $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();
 
         $provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testEmptyPasswordShouldThrowAnException()`
`52`	`52`	`public function testNullPasswordShouldThrowAnException()`
`53`	`53`	`{`
`54`	`54`	`$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();`
`55`		`- $ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapClientInterface')->getMock();`
	`55`	`+ $ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapInterface')->getMock();`
`56`	`56`	`$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();`
`57`	`57`
`58`	`58`	`$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);`