Merge branch '5.4' into 6.0

chalasr · chalasr · commit 079ec0afe323 · 2022-12-29T17:27:58.000+01:00
* 5.4:
  [Cache] Fix possibly null value passed to preg_match() in RedisTrait
diff --git a/Traits/RedisTrait.php b/Traits/RedisTrait.php
@@ -228,7 +228,7 @@ public static function createConnection(string $dsn, array $options = []): \Redi
                         restore_error_handler();
                     }
                     if (!$isConnected) {
-                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
+                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error ?? '', $error) ? sprintf(' (%s)', $error[1]) : '';
                         throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public static function createConnection(string $dsn, array $options = []): \Redi`
`228`	`228`	`restore_error_handler();`
`229`	`229`	`}`
`230`	`230`	`if (!$isConnected) {`
`231`		`- $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';`
	`231`	`+ $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error ?? '', $error) ? sprintf(' (%s)', $error[1]) : '';`
`232`	`232`	`throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');`
`233`	`233`	`}`
`234`	`234`