Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit c13bfc6682a6 · 2021-05-07T15:41:16.000+02:00
* 4.4:
  [Config][DependencyInjection] Uniformize trailing slash handling
  [PropertyInfo] Make ReflectionExtractor correctly extract nullability
  [PropertyInfo] fix attribute namespace with recursive traits
  Check redis extension version
  [Security] Update Russian translations
  [VarExporter] Add support of PHP enumerations
  [Security] Added missing Japanese translations
  [Security] Added missing Polish translations
  [Security] Add missing Italian translations #41051
  [Security] Missing translations pt_BR
  getProtocolVersion may return null
  [Translation] Set default locale for IdentityTranslatorTest
diff --git a/Traits/RedisTrait.php b/Traits/RedisTrait.php
@@ -189,7 +189,7 @@ public static function createConnection($dsn, array $options = [])
                 }
 
                 try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ['stream' => $params['ssl'] ?? null]);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();
@@ -252,7 +252,7 @@ public static function createConnection($dsn, array $options = [])
                 }
 
                 try {
-                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', $params['ssl'] ?? null);
+                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);
                 } catch (\RedisClusterException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public static function createConnection($dsn, array $options = [])`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`try {`
`192`		`- @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ['stream' => $params['ssl'] ?? null]);`
	`192`	`+ @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);`
`193`	`193`
`194`	`194`	`set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });`
`195`	`195`	`$isConnected = $redis->isConnected();`
`@@ -252,7 +252,7 @@ public static function createConnection($dsn, array $options = [])`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`try {`
`255`		`- $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', $params['ssl'] ?? null);`
	`255`	`+ $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);`
`256`	`256`	`} catch (\RedisClusterException $e) {`
`257`	`257`	`throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());`
`258`	`258`	`}`