Changeset 14150

Timestamp:

12/16/2025 04:29:43 PM (4 months ago)

Author:

espellcaste

Message:

Code Modernization: address the only, so far, two issues related to PHP 8.5.

• Instances of using null as an array offset.
• ArrayIterator::__construct(): Using an object as a backing array for ArrayIterator is deprecated.

Reference: ​https://wiki.php.net/rfc/deprecations_php_8_5\#deprecate_arrayobject_and_arrayiterator_with_objects

Follow-up to [14147].

Props espellcaste.

Closes ​https://github.com/buddypress/buddypress/pull/425
Fixes #9313 (14.0)

Location:

branches/14.0

Files:

• src/bp-activity/bp-activity-template.php (modified) (1 diff)
• src/bp-activity/classes/class-bp-activity-activity.php (modified) (3 diffs)
• src/bp-core/bp-core-template-loader.php (modified) (1 diff)
• tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php (modified) (2 diffs)

branches/14.0/src/bp-activity/bp-activity-template.php

@@ -2635 +2635 @@
                 $comments = BP_Activity_Activity::get_activity_comments( $comment->item_id, 1, constant( 'PHP_INT_MAX' ) );
 
+                if ( ! is_array( $comments ) ) {
+                    $comments = [];
+                }
+
                 // Recursively find our comment object from the comment tree.
-                $iterator  = new RecursiveArrayIterator( $comments );
-                $recursive = new RecursiveIteratorIterator( $iterator, RecursiveIteratorIterator::SELF_FIRST );
-                foreach ( $recursive as $cid => $cobj ) {
-                    // Skip items that are not a comment object.
-                    if ( ! is_numeric( $cid ) || ! is_object( $cobj ) ) {
-                        continue;
-                    }
-
-                    // We found the activity comment! Set the depth.
-                    if ( $cid === $comment->id && isset( $cobj->depth ) ) {
-                        $depth = $cobj->depth;
-                        break;
-                    }
+                $comment_in_tree = BP_Activity_Activity::find_comment_in_tree( $comments, $comment->id );
+
+                if ( is_object( $comment_in_tree ) && isset( $comment_in_tree->depth ) ) {
+                    $depth = $comment_in_tree->depth;
                 }
             }

branches/14.0/src/bp-activity/classes/class-bp-activity-activity.php

@@ -1629 +1629 @@
      * @param string $spam                Optional. 'ham_only' (default), 'spam_only' or 'all'.
      * @param int    $top_level_parent_id Optional. The id of the root-level parent activity item.
-     * @return array The updated activities with nested comments.
+     * @return array|false The updated activities with nested comments. False if no comments are found.
      */
     public static function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
@@ -1744 +1744 @@
                         if ( isset( $direct_parent->secondary_item_id ) ) {
                             // If the direct parent is not an activity update, that means we've reached
-                            // the parent activity item (eg. new_blog_post).
+                            // the parent activity item (e.g. new_blog_post).
                             if ( 'activity_update' !== $direct_parent->type ) {
                                 $parent_id = $r->item_id;
@@ -2089 +2089 @@
         return $wpdb->get_var( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET hide_sitewide = 1 WHERE user_id = %d", $user_id ) );
     }
+
+    /**
+     * Recursively find a comment object from a nested comment tree.
+     *
+     * @since 14.5.0
+     *
+     * @param array $comments  Array of comment objects with nested children.
+     * @param int   $target_id The comment ID to find.
+     * @return object|false The comment object if found, false otherwise.
+     */
+    public static function find_comment_in_tree( $comments, $target_id ) {
+
+        if ( ! is_array( $comments ) ) {
+            return false;
+        }
+
+        foreach ( $comments as $comment_id => $comment ) {
+            // Skip items that are not a comment object.
+            if ( ! is_numeric( $comment_id ) || ! is_object( $comment ) ) {
+                continue;
+            }
+
+            if ( (int) $comment_id === (int) $target_id ) {
+                return $comment;
+            }
+
+            // Recurse into children if they exist.
+            if ( ! empty( $comment->children ) && is_array( $comment->children ) ) {
+                $found = self::find_comment_in_tree( $comment->children, $target_id );
+
+                if ( false !== $found ) {
+                    return $found;
+                }
+            }
+        }
+
+        return false;
+    }
 }

branches/14.0/src/bp-core/bp-core-template-loader.php

@@ -594 +594 @@
             $url_query_chunks = bp_parse_args( $GLOBALS['wp']->query_string, array() );
             $directory        = key( $url_query_chunks );
-            if ( isset( $bp_directories[ $directory ] ) ) {
+            if ( isset( $directory, $bp_directories[ $directory ] ) ) {
                 $url_query_chunks[ $directory ] = $bp_directories[ $directory ];
             }

branches/14.0/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php

@@ -41 +41 @@
         bp_has_activities( 'display_comments=threaded' );
 
-        // Loop through activity comments generated in activity loop.
-        $recursive = new RecursiveIteratorIterator( new RecursiveArrayIterator( $GLOBALS['activities_template']->activities[0]->children ), RecursiveIteratorIterator::SELF_FIRST );
-        foreach ( $recursive as $aid => $a ) {
-            if ( ! is_numeric( $aid ) || ! is_object( $a ) ) {
+        $children = $GLOBALS['activities_template']->activities[0]->children;
+
+        foreach ( array( $comment_one, $comment_one_one, $comment_two ) as $aid ) {
+            $a = BP_Activity_Activity::find_comment_in_tree( $children, $aid );
+
+            if ( false === $a ) {
                 continue;
             }
@@ -66 +68 @@
                     break;
             }
-
         }