geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-28 11:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/pr/346'

Browse Source
This commit is contained in:
Daniele Alessandri
2016-06-14 17:19:32 +02:00
parent e0b4b2c20a ce8b3fb683
commit e88ffc767d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Connection/Replication/SentinelReplication.php
+4 -3
View File
@@ -239,9 +239,10 @@ class SentinelReplication implements ReplicationInterface
}
if (is_array($parameters)) {
// We unset "password" and "database" from user-supplied parameters
// as they are not needed when connecting to sentinels.
unset($parameters['database'], $parameters['password']);
// We explicitly set "database" and "password" to null,
// so that no AUTH and SELECT command is send to the sentinels.
$parameters['database'] = null;
$parameters['password'] = null;
if (!isset($parameters['timeout'])) {
$parameters['timeout'] = $this->sentinelTimeout;
tests/Predis/Connection/Replication/SentinelReplicationTest.php
+1 -2
View File
@@ -44,8 +44,7 @@ class SentinelReplicationTest extends PredisTestCase
$parameters = $replication->getSentinelConnection()->getParameters()->toArray();
$this->assertArrayNotHasKey('password', $parameters);
$this->assertArrayNotHasKey('database', $parameters);
$this->assertArraySubset(array('database' => null, 'password' => null), $parameters);
}
/**