Skip to content

Commit 961c176

Browse files
committed
fix: more fixes for psalm
1 parent 042d81a commit 961c176

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/DependencyInjection/SncRedisExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function getXsdValidationBasePath(): string
9494
private function loadClient(array $client, ContainerBuilder $container): void
9595
{
9696
$dsnResolver = /**
97-
* @return Configuration\RedisDsn|Configuration\RedisEnvDsn
97+
* @return RedisDsn|RedisEnvDsn
9898
*/
9999
static function ($dsn) use ($container) {
100100
$usedEnvs = null;

src/Factory/PhpredisClientFactory.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,18 @@ public function create(string $class, array $dsns, array $options, string $alias
128128
* @param RedisDsn[] $dsns
129129
* @param mixed[] $options
130130
*
131-
* @return Redis|RedisArray|RedisCluster|Relay\Relay
131+
* @return Redis|RedisArray|RedisCluster|Relay
132132
*/
133133
private function createRedisArrayClient(array $dsns, string $class, string $alias, array $options, bool $loggingEnabled)
134134
{
135135
if (count($dsns) < 2) {
136136
throw new LogicException('The redis_array option requires at least two DSNs.');
137137
}
138138

139-
$hosts = array_map(static fn (RedisDsn $dsn) => ($dsn->getTls() ? 'tls://' : '') . $dsn->getHost() . ':' . $dsn->getPort(), $dsns);
139+
$hosts = array_values(array_map(
140+
static fn (RedisDsn $dsn) => ($dsn->getTls() ? 'tls://' : '') . $dsn->getHost() . ':' . $dsn->getPort(),
141+
$dsns
142+
));
140143

141144
$redisArrayOptions = [
142145
'connect_timeout' => (float) ($options['connection_timeout'] ?? 5),
@@ -419,7 +422,7 @@ private function loadSlaveFailoverType(string $type): int
419422
*
420423
* @return T
421424
*
422-
* @template T of Redis|RedisCluster|Relay\Relay
425+
* @template T of Redis|RedisCluster|Relay
423426
*/
424427
private function createLoggingProxy(object $client, string $alias): object
425428
{

tests/DependencyInjection/SncRedisExtensionEnvTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ public function testPhpRedisClusterOption(): void
226226
$this->assertSame(
227227
[
228228
'cluster' => true,
229+
'redis_array' => false,
229230
'connection_async' => false,
230231
'connection_persistent' => false,
231-
'redis_array' => false,
232232
'connection_timeout' => 5,
233233
'scan' => null,
234234
'read_write_timeout' => null,
@@ -260,7 +260,6 @@ public function testPhpRedisSentinelOption(): void
260260
'redis_array' => false,
261261
'connection_async' => false,
262262
'connection_persistent' => false,
263-
'redis_array' => false,
264263
'connection_timeout' => 5,
265264
'scan' => null,
266265
'read_write_timeout' => null,

0 commit comments

Comments
 (0)