Upgrade predis to v2.3.0

Fixes a bug with $server['scheme'] and simplifies some of the config code. Fixes #214
erikdubbelboer · Dec 20, 2024 · 543cbc7 · 543cbc7
1 parent 3e60b21
commit 543cbc7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     "require": {
         "ext-mbstring": "*",
         "ext-json": "*",
-        "predis/predis": "v1.1.9",
+        "predis/predis": "v2.3.0",
         "paragonie/random_compat": ">=2"
     },
     "minimum-stability": "stable",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/common.inc.php b/includes/common.inc.php
@@ -95,20 +95,20 @@
   $server['keys'] = $config['keys'];
 }
 
-if (!isset($config['scansize'])) {
-  $config['scansize'] = 1000;
-}
-
-if (!isset($config['scanmax'])) {
-  $config['scanmax'] = 0;
-}
-
 if (!isset($server['scansize'])) {
-  $server['scansize'] = $config['scansize'];
+  if (isset($config['scansize'])) {
+    $server['scansize'] = $config['scansize'];
+  } else {
+    $server['scansize'] = 1000;
+  }
 }
 
 if (!isset($server['scanmax'])) {
-  $server['scanmax'] = $config['scanmax'];
+  if (isset($config['scanmax'])) {
+    $server['scanmax'] = $config['scanmax'];
+  } else {
+    $server['scanmax'] = 0;
+  }
 }
 
 if (!isset($server['serialization'])) {
@@ -125,8 +125,8 @@
   $config['showEmptyNamespaceAsKey'] = false;
 }
 
-if (!isset($config['scheme']) || empty($config['scheme'])) {
-  $config['scheme'] = 'tcp';
+if (!isset($server['scheme']) || empty($server['scheme'])) {
+  $server['scheme'] = 'tcp';
 }
 
 // Setup a connection to Redis.