From cf73c7edba44394f98a01ea8160ac7849b0d4971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Stasicki?= Date: Fri, 13 Sep 2024 18:57:39 +0200 Subject: [PATCH] [Cache] Fix RedisSentinel params types --- .../Cache/Tests/Adapter/RedisAdapterSentinelTest.php | 2 +- src/Symfony/Component/Cache/Traits/RedisTrait.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php index f54460b1f7fdf..9eba3cb7d1dee 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php @@ -33,7 +33,7 @@ public static function setUpBeforeClass(): void throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.'); } - self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => $service, 'prefix' => 'prefix_']); + self::$redis = AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']&timeout=0&retry_interval=0&read_timeout=0', ['redis_sentinel' => $service, 'prefix' => 'prefix_']); } public function testInvalidDSNHasBothClusterAndSentinel() diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index 129254bd68c7a..126f568112d3a 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -223,10 +223,10 @@ public static function createConnection(string $dsn, array $options = []) $options = [ 'host' => $host, 'port' => $port, - 'connectTimeout' => $params['timeout'], + 'connectTimeout' => (float) $params['timeout'], 'persistent' => $params['persistent_id'], - 'retryInterval' => $params['retry_interval'], - 'readTimeout' => $params['read_timeout'], + 'retryInterval' => (int) $params['retry_interval'], + 'readTimeout' => (float) $params['read_timeout'], ]; if ($passAuth) {