Changeset 13309

Timestamp:

08/08/2022 09:24:03 PM (2 years ago)

Author:

imath

Message:

Adapt to WP Cache API latest change about cache key requirements

In WordPress 6.1, a cache key needs to be an integer or a "not empty" string. See ​WP53818 changeset.

After analysing the failing PHPUnit failing tests, it seems we were not careful enough about cache key checks in a few cases:

• When generating an activity comment without a corresponding parent activity in our tests.
• When trying to cache a group membership ID for the group creator before this membership has been created.
• When trying to check if a member had a member type or a group had a group type using an empty string although into 2 of our unit tests.

Fixes #8727

Location:

trunk

Files:

• src/bp-activity/bp-activity-cache.php (modified) (1 diff)
• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• src/bp-groups/bp-groups-cache.php (modified) (1 diff)
• src/bp-groups/bp-groups-functions.php (modified) (1 diff)
• src/bp-members/bp-members-functions.php (modified) (1 diff)
• tests/phpunit/testcases/groups/types.php (modified) (1 diff)
• tests/phpunit/testcases/members/types.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-cache.php

@@ -50 +50 @@
 
     // Clear the comments cache for the parent activity ID.
-    if ( 'activity_comment' === $activity->type ) {
+    if ( 'activity_comment' === $activity->type && ! empty( $activity->item_id ) ) {
         wp_cache_delete( $activity->item_id, 'bp_activity_comments' );
     }

trunk/src/bp-activity/bp-activity-functions.php

@@ -2064 +2064 @@
 
     // If this is an activity comment, rebuild the tree.
-    if ( 'activity_comment' === $activity->type ) {
+    if ( 'activity_comment' === $activity->type && ! empty( $activity->item_id ) ) {
         // Also clear the comment cache for the parent activity ID.
         wp_cache_delete( $activity->item_id, 'bp_activity_comments' );

trunk/src/bp-groups/bp-groups-cache.php

@@ -250 +250 @@
 function bp_groups_clear_user_group_cache_on_membership_save( BP_Groups_Member $member ) {
     wp_cache_delete( $member->user_id, 'bp_groups_memberships_for_user' );
-    wp_cache_delete( $member->id, 'bp_groups_memberships' );
+
+    if ( ! is_null( $member->id ) ) {
+        wp_cache_delete( $member->id, 'bp_groups_memberships' );
+    }
 }
 add_action( 'groups_member_before_save', 'bp_groups_clear_user_group_cache_on_membership_save' );

trunk/src/bp-groups/bp-groups-functions.php

@@ -3248 +3248 @@
     }
 
+    $group_id = (int) $group_id;
+    if ( ! $group_id ) {
+        return false;
+    }
+
     // Get all group's group types.
     $types = bp_groups_get_group_type( $group_id, false );

trunk/src/bp-members/bp-members-functions.php

@@ -3266 +3266 @@
     // Bail if no valid member type was passed.
     if ( empty( $member_type ) || ! bp_get_member_type_object( $member_type ) ) {
+        return false;
+    }
+
+    $user_id = (int) $user_id;
+    if ( ! $user_id ) {
         return false;
     }

trunk/tests/phpunit/testcases/groups/types.php

@@ -196 +196 @@
         bp_groups_register_group_type( 'foo' );
 
-        $this->assertFalse( bp_groups_has_group_type( '', 'foo' ) );
+        $this->assertFalse( bp_groups_has_group_type( 0, 'foo' ) );
     }
 

trunk/tests/phpunit/testcases/members/types.php

@@ -374 +374 @@
         bp_register_member_type( 'foo' );
 
-        $this->assertFalse( bp_has_member_type( '', 'foo' ) );
+        $this->assertFalse( bp_has_member_type( 0, 'foo' ) );
     }