Changeset 55741

Timestamp:

05/10/2023 09:09:06 AM (17 months ago)

Author:

spacedmonkey

Message:

Build/Test Tools: Call wp_cache_flush_runtime in WP_UnitTestCase.

In WP_UnitTestCase::flush_cache method, the properties of the global $wp_object_cache object were manaully being reset to flush the cache. The function wp_cache_flush_runtime was added in [52772] and is designed to reset any class properties to default values. Using wp_cache_flush_runtime improve compatibility with third party object caches, as it allows developers to define their own wp_cache_flush_runtime function.

Props rmccue, johnbillion, wonderboymusic, boonebgorges, voldemortensen, dd32, DrewAPicture, tillkruess, spacedmonkey.
Fixes #31463.

Location:

trunk/tests/phpunit/includes

Files:

• abstract-testcase.php (modified) (1 diff)
• object-cache.php (modified) (2 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -388 +388 @@
         global $wp_object_cache;
 
-        $wp_object_cache->group_ops      = array();
-        $wp_object_cache->stats          = array();
-        $wp_object_cache->memcache_debug = array();
-        $wp_object_cache->cache          = array();
-
-        if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
+        wp_cache_flush_runtime();
+
+        if ( is_object( $wp_object_cache ) && method_exists( $wp_object_cache, '__remoteset' ) ) {
             $wp_object_cache->__remoteset();
         }

trunk/tests/phpunit/includes/object-cache.php

@@ -326 +326 @@
     switch ( $feature ) {
         case 'get_multiple':
+        case 'flush_runtime':
             return true;
         default:
             return false;
     }
+}
+
+/**
+ * Removes all cache items from the in-memory runtime cache.
+ *
+ * @return bool True on success, false on failure.
+ */
+function wp_cache_flush_runtime() {
+    global $wp_object_cache;
+    return $wp_object_cache->flush_runtime();
 }
 
@@ -1411 +1422 @@
 
         return $result;
+    }
+
+    /**
+     * Clears the in-memory cache of all data leaving the external cache untouched.
+     *
+     * @return bool Always returns true.
+     */
+    public function flush_runtime() {
+        $this->cache = array();
+
+        return true;
     }