Skip to content

Commit e5088ac

Browse files
committed
feature #19894 [Cache] Add "persistent_id" option to RedisAdapter::createConnection() (nicolas-grekas)
This PR was merged into the 3.2-dev branch. Discussion ---------- [Cache] Add "persistent_id" option to RedisAdapter::createConnection() | Q | A | ------------- | --- | Branch? | master | New feature? | yes | Tests pass? | yes | License | MIT Commits ------- 3ee02a0 [Cache] Add persistent_id option to RedisAdapter::createConnection()
2 parents 0954f3d + 3ee02a0 commit e5088ac

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Symfony/Component/Cache/Adapter/RedisAdapter.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class RedisAdapter extends AbstractAdapter
2525
private static $defaultConnectionOptions = array(
2626
'class' => null,
2727
'persistent' => 0,
28+
'persistent_id' => null,
2829
'timeout' => 0,
2930
'read_timeout' => 0,
3031
'retry_interval' => 0,
@@ -99,9 +100,9 @@ public static function createConnection($dsn, array $options = array())
99100
$class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
100101

101102
if (is_a($class, \Redis::class, true)) {
102-
$connect = empty($params['persistent']) ? 'connect' : 'pconnect';
103+
$connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
103104
$redis = new $class();
104-
@$redis->{$connect}($params['host'], $params['port'], $params['timeout'], null, $params['retry_interval']);
105+
@$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
105106

106107
if (@!$redis->isConnected()) {
107108
$e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';

src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public function testCreateConnection()
3939
'class' => 'Predis\Client',
4040
'timeout' => 3,
4141
'persistent' => 0,
42+
'persistent_id' => null,
4243
'read_timeout' => 0,
4344
'retry_interval' => 0,
4445
'database' => '1',

0 commit comments

Comments
 (0)