Changeset 13312

Timestamp:

08/13/2022 08:21:06 AM (2 years ago)

Author:

imath

Message:

Avoid various PHP 8.1 deprecated notices

Here are the treated deprecated notices:

• ctype_digit() Argument of type int will be interpreted as string in the future.
• Automatic conversion of false to array.
• Passing null to strtotime() $datetime parameter.

Props renatonascalves, rafiahmedd

See #8649

Location:

trunk/src

Files:

• bp-activity/classes/class-bp-activity-activity.php (modified) (4 diffs)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-groups/bp-groups-activity.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (2 diffs)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-messages/classes/class-bp-messages-message.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/functions.php (modified) (1 diff)

trunk/src/bp-activity/classes/class-bp-activity-activity.php

@@ -1241 +1241 @@
         );
 
-        $where_args = false;
+        $where_args = array();
 
         if ( ! empty( $r['user_id'] ) ) {
@@ -1568 +1568 @@
         }
 
-        $comments = wp_cache_get( $activity_id, 'bp_activity_comments' );
+        $comments       = array();
+        $comments_cache = wp_cache_get( $activity_id, 'bp_activity_comments' );
 
         // We store the string 'none' to cache the fact that the
         // activity item has no comments.
-        if ( 'none' === $comments ) {
-            $comments = false;
+        if ( 'none' === $comments_cache ) {
+            return false;
 
             // A true cache miss.
-        } elseif ( empty( $comments ) ) {
+        } elseif ( empty( $comments_cache ) ) {
 
             $bp = buddypress();
@@ -1690 +1691 @@
             }
 
-            // If we cache a value of false, it'll count as a cache
+            // If we cache an empty array, it'll count as a cache
             // miss the next time the activity comments are fetched.
             // Storing the string 'none' is a hack workaround to
             // avoid unnecessary queries.
-            if ( false === $comments ) {
+            if ( ! $comments ) {
                 $cache_value = 'none';
             } else {
@@ -1701 +1702 @@
 
             wp_cache_set( $activity_id, $cache_value, 'bp_activity_comments' );
+        } else {
+            $comments = (array) $comments_cache;
         }
 

trunk/src/bp-core/bp-core-avatars.php

@@ -811 +811 @@
 
         /** This filter is documented in bp-core/bp-core-avatars.php */
-        $item_id = apply_filters( 'bp_core_avatar_item_id', $args['item_id'], $args['object'] );
+        $item_id = (int) apply_filters( 'bp_core_avatar_item_id', $args['item_id'], $args['object'] );
     } else {
-        $item_id = $args['item_id'];
-    }
-
-    if ( $item_id && ( ctype_digit( $item_id ) || is_int( $item_id ) ) ) {
-        $item_id = (int) $item_id;
-    } else {
+        $item_id = (int) str_replace( '.', '', $args['item_id'] );
+    }
+
+    if ( ! $item_id ) {
         return false;
     }

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

@@ -3401 +3401 @@
     }
 
-    $db_types = wp_cache_get( $taxonomy, 'bp_object_terms' );
+    $db_types = (array) wp_cache_get( $taxonomy, 'bp_object_terms' );
 
     if ( ! $db_types ) {

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

@@ -890 +890 @@
 
     // Check the time period, and maybe delete their recent group activity.
-    if ( time() <= strtotime( '+5 minutes', (int) strtotime( $membership->date_modified ) ) ) {
+    if ( $membership->date_modified && time() <= strtotime( '+5 minutes', (int) strtotime( $membership->date_modified ) ) ) {
         bp_activity_delete( array(
             'component' => buddypress()->groups->id,

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

@@ -2970 +2970 @@
     }
 
-    $types = wp_filter_object_list( $types, $args, $operator );
+    $types = array_filter( wp_filter_object_list( $types, $args, $operator ) );
 
     /**
@@ -2984 +2984 @@
      * @param string $operator  'or' to match any of $args, 'and' to require all.
      */
-    $types = apply_filters( 'bp_groups_get_group_types', $types, $args, $operator );
-
-    if ( 'names' === $output ) {
+    $types = (array) apply_filters( 'bp_groups_get_group_types', $types, $args, $operator );
+
+    if ( $types && 'names' === $output ) {
         $types = wp_list_pluck( $types, 'name' );
     }

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

@@ -3010 +3010 @@
     }
 
-    $types = wp_filter_object_list( $types, $args, $operator );
+    $types = array_filter( wp_filter_object_list( $types, $args, $operator ) );
 
     /**
@@ -3024 +3024 @@
      * @param string $operator  'or' to match any of $args, 'and' to require all.
      */
-    $types = apply_filters( 'bp_get_member_types', $types, $args, $operator );
-
-    if ( 'names' === $output ) {
+    $types = (array) apply_filters( 'bp_get_member_types', $types, $args, $operator );
+
+    if ( $types && 'names' === $output ) {
         $types = wp_list_pluck( $types, 'name' );
     }

trunk/src/bp-messages/classes/class-bp-messages-message.php

@@ -61 +61 @@
      * Message recipients.
      *
-     * @var bool|array
-     */
-    public $recipients = false;
+     * @var array
+     */
+    public $recipients = array();
 
     /**

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -245 +245 @@
      * from the component ID.
      */
-    $current_component_id = bp_core_get_active_components( array( 'slug' => bp_current_component() ) );
+    $current_component_id = bp_core_get_active_components( array( 'id' => bp_current_component() ) );
     if ( $current_component_id && 1 === count( $current_component_id ) ) {
         $current_component_id = reset( $current_component_id );