Commitca53d3e

committed

Merge branch '4.0'

* 4.0: fix merge

2 parents8659ba9 +a24fa39 commitca53d3eCopy full SHA for ca53d3e

File tree

-2

lines changed

src/Symfony/Component
- Cache/Traits
  - RedisTrait.php
- Security/Core/Tests/Authentication/Provider
  - LdapBindAuthenticationProviderTest.php

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,11 @@ public static function createConnection($dsn, array $options = array())`
`120`	`120`	`$redis =new$class();`
`121`	`121`
`122`	`122`	`$initializer =function ($redis)use ($connect,$params,$dsn,$auth) {`
`123`		`- @$redis->{$connect}($params['host'],$params['port'],$params['timeout'],$params['persistent_id'],$params['retry_interval']);`
	`123`	`+try {`
	`124`	`+ @$redis->{$connect}($params['host'],$params['port'],$params['timeout'],$params['persistent_id'],$params['retry_interval']);`
	`125`	`+ }catch (\RedisException$e) {`
	`126`	`+thrownewInvalidArgumentException(sprintf('Redis connection failed (%s): %s',$e->getMessage(),$dsn));`
	`127`	`+ }`
`124`	`128`
`125`	`129`	`if (@!$redis->isConnected()) {`
`126`	`130`	`$e = ($e =error_get_last()) &&preg_match('/^Redis::p?connect: (.*)/',$e['message'],$e) ?sprintf(' (%s)',$e[1]) :'';`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testEmptyPasswordShouldThrowAnException()`
`52`	`52`	`publicfunctiontestNullPasswordShouldThrowAnException()`
`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 =newLdapBindAuthenticationProvider($userProvider,$userChecker,'key',$ldap);`

Comments

(0)