Changeset 62028

Timestamp:

03/14/2026 07:22:14 PM (2 weeks ago)

Author:

westonruter

Message:

Cache API: Address code quality issues with wp_cache_switch_to_blog().

This addresses 3 PHPStan errors at rule level 8:

• arguments.count: Function wp_cache_switch_to_blog_fallback() invoked with 1 parameter, 0 required.
• method.nonObject: Cannot call method switch_to_blog() on class-string|object.
• missingType.return: Function wp_cache_switch_to_blog() has no return type specified.

Developed as subset of ​https://github.com/WordPress/wordpress-develop/pull/11151

Follow-up to r61760.

Props westonruter, johnjamesjacoby.
See #23290, #64238.

File:

• trunk/src/wp-includes/cache-compat.php (modified) (2 diffs)

trunk/src/wp-includes/cache-compat.php

@@ -328 +328 @@
      * @param int $blog_id Site ID.
      */
-    function wp_cache_switch_to_blog( $blog_id ) {
+    function wp_cache_switch_to_blog( $blog_id ): void {
         global $wp_object_cache;
 
         // Attempt to use the drop-in object cache method if it exists.
-        if ( method_exists( $wp_object_cache, 'switch_to_blog' ) ) {
+        if ( is_object( $wp_object_cache ) && method_exists( $wp_object_cache, 'switch_to_blog' ) ) {
             $wp_object_cache->switch_to_blog( $blog_id );
             return;
@@ -341 +341 @@
          * for the new blog ID.
          */
-        wp_cache_switch_to_blog_fallback( $blog_id );
-    }
-endif;
+        wp_cache_switch_to_blog_fallback();
+    }
+endif;