upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #28954 from nextcloud/backport/28933/stable22

Browse source 
[stable22] Fix check for redis minimal version
This commit is contained in:
Vincent Petry 2021-09-27 08:14:32 +02:00 committed by GitHub
commit 53a18945d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/RedisFactory.php
View file

@ -27,7 +27,7 @@
namespace OC;
class RedisFactory {
public const REDIS_MINIMAL_VERSION = '2.2.5';
public const REDIS_MINIMAL_VERSION = '3.1.3';
public const REDIS_EXTRA_PARAMETERS_MINIMAL_VERSION = '5.3.0';
/** @var \Redis|\RedisCluster */
@ -139,8 +139,8 @@ class RedisFactory {
/**
* Get the ssl context config
*
* @param Array $config the current config
* @return Array|null
* @param array $config the current config
* @return array|null
* @throws \UnexpectedValueException
*/
private function getSslContext($config) {
@ -167,9 +167,9 @@ class RedisFactory {
return $this->instance;
}
public function isAvailable() {
return extension_loaded('redis')
&& version_compare(phpversion('redis'), '2.2.5', '>=');
public function isAvailable(): bool {
return \extension_loaded('redis') &&
\version_compare(\phpversion('redis'), self::REDIS_MINIMAL_VERSION, '>=');
}
/**