Changeset 7308 for trunk/bp-friends/bp-friends-classes.php

Timestamp:

07/25/2013 02:28:28 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Fix some PHP 5.4 static method E_STRICT warnings across several components. More to do here. See #5108.

File:

• trunk/bp-friends/bp-friends-classes.php (modified) (17 diffs)

trunk/bp-friends/bp-friends-classes.php

@@ -11 +11 @@
 
 class BP_Friends_Friendship {
-    var $id;
-    var $initiator_user_id;
-    var $friend_user_id;
-    var $is_confirmed;
-    var $is_limited;
-    var $date_created;
-
-    var $is_request;
-    var $populate_friend_details;
-
-    var $friend;
-
-    function __construct( $id = null, $is_request = false, $populate_friend_details = true ) {
+    public $id;
+    public $initiator_user_id;
+    public $friend_user_id;
+    public $is_confirmed;
+    public $is_limited;
+    public $date_created;
+
+    public $is_request;
+    public $populate_friend_details;
+
+    public $friend;
+
+    public function __construct( $id = null, $is_request = false, $populate_friend_details = true ) {
         $this->is_request = $is_request;
 
@@ -33 +33 @@
     }
 
-    function populate() {
+    public function populate() {
         global $wpdb, $bp;
 
@@ -53 +53 @@
     }
 
-    function save() {
+    public function save() {
         global $wpdb, $bp;
 
@@ -79 +79 @@
     }
 
-    function delete() {
-        global $wpdb, $bp;
-
+    public function delete() {
+        global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d", $this->id ) );
     }
@@ -87 +86 @@
     /** Static Methods ********************************************************/
 
-    function get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false ) {
+    public static function get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false ) {
         global $wpdb, $bp;
 
@@ -112 +111 @@
     }
 
-    function get_friendship_id( $user_id, $friend_id ) {
+    public static function get_friendship_id( $user_id, $friend_id ) {
         global $wpdb, $bp;
 
@@ -118 +117 @@
     }
 
-    function get_friendship_request_user_ids( $user_id ) {
+    public static function get_friendship_request_user_ids( $user_id ) {
         global $wpdb, $bp;
 
@@ -124 +123 @@
     }
 
-    function total_friend_count( $user_id = 0 ) {
+    public static function total_friend_count( $user_id = 0 ) {
         global $wpdb, $bp;
 
@@ -140 +139 @@
 
         bp_update_user_meta( $user_id, 'total_friend_count', (int) $count );
-        return (int) $count;
-    }
-
-    function search_friends( $filter, $user_id, $limit = null, $page = null ) {
+
+        return absint( $count );
+    }
+
+    public static function search_friends( $filter, $user_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
 
@@ -183 +183 @@
     }
 
-    function check_is_friend( $loggedin_userid, $possible_friend_userid ) {
+    public static function check_is_friend( $loggedin_userid, $possible_friend_userid ) {
         global $wpdb, $bp;
 
@@ -202 +202 @@
     }
 
-    function get_bulk_last_active( $user_ids ) {
+    public static function get_bulk_last_active( $user_ids ) {
         global $wpdb;
 
@@ -210 +210 @@
     }
 
-    function accept($friendship_id) {
-        global $wpdb, $bp;
-
+    public static function accept($friendship_id) {
+        global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) );
     }
 
-    function withdraw($friendship_id) {
-        global $wpdb, $bp;
-
+    public static function withdraw($friendship_id) {
+        global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND initiator_user_id = %d", $friendship_id, bp_loggedin_user_id() ) );
     }
 
-    function reject($friendship_id) {
-        global $wpdb, $bp;
-
+    public static function reject($friendship_id) {
+        global $wpdb, $bp;
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND friend_user_id = %d", $friendship_id, bp_loggedin_user_id() ) );
     }
 
-    function search_users( $filter, $user_id, $limit = null, $page = null ) {
+    public static function search_users( $filter, $user_id, $limit = null, $page = null ) {
         global $wpdb, $bp;
 
@@ -254 +251 @@
     }
 
-    function search_users_count( $filter ) {
+    public static function search_users_count( $filter ) {
         global $wpdb, $bp;
 
@@ -277 +274 @@
     }
 
-    function sort_by_name( $user_ids ) {
+    public static function sort_by_name( $user_ids ) {
         global $wpdb, $bp;
 
@@ -288 +285 @@
     }
 
-    function get_random_friends( $user_id, $total_friends = 5 ) {
+    public static function get_random_friends( $user_id, $total_friends = 5 ) {
         global $wpdb, $bp;
 
@@ -306 +303 @@
     }
 
-    function get_invitable_friend_count( $user_id, $group_id ) {
+    public static function get_invitable_friend_count( $user_id, $group_id ) {
 
         // Setup some data we'll use below
@@ -333 +330 @@
     }
 
-    function get_user_ids_for_friendship( $friendship_id ) {
-        global $wpdb, $bp;
-
+    public static function get_user_ids_for_friendship( $friendship_id ) {
+        global $wpdb, $bp;
         return $wpdb->get_row( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} WHERE id = %d", $friendship_id ) );
     }
 
-    function delete_all_for_user( $user_id ) {
+    public static function delete_all_for_user( $user_id ) {
         global $wpdb, $bp;