Skip to content

Commit 150aee0

Browse files
committed
Merge branch 'master' into 3.2-merge
# Conflicts: # .github/workflows/test.yml # src/command/composer.json # src/serializer/src/Contract/CacheableSupportsMethodInterface.php # src/validation/src/ValidationRuleParser.php
2 parents 4bebd2a + 8487f72 commit 150aee0

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/tests export-ignore
22
/.github export-ignore
3+
/types export-ignore

src/RedisConnection.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,7 @@ protected function createRedisCluster(): RedisCluster
203203
$parameters[] = $this->config['timeout'] ?? 0.0;
204204
$parameters[] = $this->config['cluster']['read_timeout'] ?? 0.0;
205205
$parameters[] = $this->config['cluster']['persistent'] ?? false;
206-
if (isset($this->config['auth'])) {
207-
$parameters[] = $this->config['auth'];
208-
}
206+
$parameters[] = $this->config['auth'] ?? null;
209207
if (! empty($this->config['cluster']['context'])) {
210208
$parameters[] = $this->config['cluster']['context'];
211209
}

0 commit comments

Comments
 (0)