Merge remote-tracking branch 'origin/develop'

rhubarbgroup · Aug 11, 2023 · 856f496 · 856f496
2 parents 326d8a1 + f9b58ce
commit 856f496
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 16 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -30,15 +30,18 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: msgpack, igbinary, mbstring, redis, relay
           coverage: none
+          tools: parallel-lint
 
       - name: Install PHP Dependencies
         uses: ramsey/composer-install@v2
 
+      - name: Check source code for syntax errors
+        run: composer exec --no-interaction -- parallel-lint *.php dependencies/ includes/ tests/
+
       - name: Run PHPStan
         run: composer run phpstan
 
   editorconfig:
-
     name: EditorConfig
     runs-on: ubuntu-latest
     timeout-minutes: 5

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.4
+
+- Improved handling of unexpected transaction results
+
 ## 2.4.3
 
 - Fixed PHP `<=7.2` syntax error

diff --git a/includes/object-cache.php b/includes/object-cache.php
@@ -3,7 +3,7 @@
  * Plugin Name: Redis Object Cache Drop-In
  * Plugin URI: https://wordpress.org/plugins/redis-cache/
  * Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
- * Version: 2.4.3
+ * Version: 2.4.4
  * Author: Till Krüss
  * Author URI: https://objectcache.pro
  * License: GPLv3
@@ -1299,7 +1299,9 @@ protected function add_multiple_at_once( array $data, $group = 'default', $expir
             }, $tx->{$method}() ?: [] );
 
             if ( count( $results ) !== count( $keys ) ) {
-                throw new Exception( 'Redis pipeline returned unexpected result' );
+                $tx->discard();
+
+                return array_fill_keys( $keys, false );
             }
 
             $results = array_combine( $keys, $results );
@@ -1548,7 +1550,9 @@ protected function delete_multiple_at_once( array $keys, $group = 'default' ) {
             }, $tx->{$method}() ?: [] );
 
             if ( count( $results ) !== count( $keys ) ) {
-                throw new Exception( 'Redis pipeline returned unexpected result' );
+                $tx->discard();
+
+                return array_fill_keys( $keys, false );
             }
 
             $execute_time = microtime( true ) - $start_time;
@@ -2270,7 +2274,9 @@ protected function set_multiple_at_once( array $data, $group = 'default', $expir
             }, $tx->{$method}() ?: [] );
 
             if ( count( $results ) !== count( $keys ) ) {
-                throw new Exception( 'Redis pipeline returned unexpected result' );
+                $tx->discard();
+
+                return array_fill_keys( $keys, false );
             }
 
             $results = array_combine( $keys, $results );

diff --git a/languages/redis-cache.pot b/languages/redis-cache.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the GPLv3.
 msgid ""
 msgstr ""
-"Project-Id-Version: Redis Object Cache 2.4.3\n"
+"Project-Id-Version: Redis Object Cache 2.4.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/redis-cache\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-06-29T10:40:20+00:00\n"
+"POT-Creation-Date: 2023-08-11T20:06:44+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: redis-cache\n"
@@ -294,30 +294,30 @@ msgstr ""
 msgid "Object cache drop-in could not be updated. Redis server is unreachable: %s"
 msgstr ""
 
-#: includes/object-cache.php:2911
+#: includes/object-cache.php:2916
 msgid "Error establishing a Redis connection"
 msgstr ""
 
 #. translators: %s = Formatted wp-config.php file name.
-#: includes/object-cache.php:2918
+#: includes/object-cache.php:2923
 msgid "WordPress is unable to establish a connection to Redis. This means that the connection information in your %s file are incorrect, or that the Redis server is not reachable."
 msgstr ""
 
-#: includes/object-cache.php:2923
+#: includes/object-cache.php:2928
 msgid "Is the correct Redis host and port set?"
 msgstr ""
 
-#: includes/object-cache.php:2924
+#: includes/object-cache.php:2929
 msgid "Is the Redis server running?"
 msgstr ""
 
 #. translators: %s = Link to installation instructions.
-#: includes/object-cache.php:2929
+#: includes/object-cache.php:2934
 msgid "If you need help, please read the <a href=\"%s\">installation instructions</a>."
 msgstr ""
 
 #. translators: %1$s = Formatted object-cache.php file name, %2$s = Formatted wp-content directory name.
-#: includes/object-cache.php:2936
+#: includes/object-cache.php:2941
 msgid "To disable Redis, delete the %1$s file in the %2$s directory."
 msgstr ""
 

diff --git a/readme.txt b/readme.txt
@@ -3,9 +3,9 @@ Contributors: tillkruess, a5hleyrich
 Donate link: https://github.com/sponsors/tillkruss
 Tags: redis, object cache, cache, object caching, caching performance, relay, predis, phpredis
 Requires at least: 3.3
-Tested up to: 6.2
+Tested up to: 6.3
 Requires PHP: 7.2
-Stable tag: 2.4.3
+Stable tag: 2.4.4
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -62,6 +62,10 @@ Redis Object Cache has various WP CLI commands, for more information run `wp hel
 
 == Changelog ==
 
+= 2.4.4 =
+
+- Improved handling of unexpected transaction results
+
 = 2.4.3 =
 
 - Fixed PHP `<=7.2` syntax error

diff --git a/redis-cache.php b/redis-cache.php
@@ -3,7 +3,7 @@
  * Plugin Name: Redis Object Cache
  * Plugin URI: https://wordpress.org/plugins/redis-cache/
  * Description: A persistent object cache backend powered by Redis. Supports Predis, PhpRedis, Relay, replication, sentinels, clustering and WP-CLI.
- * Version: 2.4.3
+ * Version: 2.4.4
  * Text Domain: redis-cache
  * Domain Path: /languages
  * Network: true