Changeset 28528

Timestamp:

05/19/2014 03:47:33 PM (10 years ago)

Author:

wonderboymusic

Message:

Add access modifiers to WP_User_Query.

Add magic methods for BC: get(), set(), isset(), unset(), and
call().

See #27881, #22234.

File:

• trunk/src/wp-includes/user.php (modified) (11 diffs)

trunk/src/wp-includes/user.php

@@ -450 +450 @@
      * @var array
      */
-    var $query_vars = array();
+    public $query_vars = array();
 
     /**
@@ -459 +459 @@
      * @var array
      */
-    var $results;
+    private $results;
 
     /**
@@ -468 +468 @@
      * @var int
      */
-    var $total_users = 0;
+    private $total_users = 0;
 
     // SQL clauses
-    var $query_fields;
-    var $query_from;
-    var $query_where;
-    var $query_orderby;
-    var $query_limit;
+    public $query_fields;
+    public $query_from;
+    public $query_where;
+    public $query_orderby;
+    public $query_limit;
 
     /**
@@ -485 +485 @@
      * @return WP_User_Query
      */
-    function __construct( $query = null ) {
+    public function __construct( $query = null ) {
         if ( ! empty( $query ) ) {
             $this->prepare_query( $query );
@@ -499 +499 @@
      * @param string|array $args Optional. The query variables.
      */
-    function prepare_query( $query = array() ) {
+    public function prepare_query( $query = array() ) {
         global $wpdb;
 
@@ -713 +713 @@
      * @global wpdb $wpdb WordPress database object for queries.
      */
-    function query() {
+    public function query() {
         global $wpdb;
 
@@ -765 +765 @@
      * @return mixed
      */
-    function get( $query_var ) {
+    public function get( $query_var ) {
         if ( isset( $this->query_vars[$query_var] ) )
             return $this->query_vars[$query_var];
@@ -781 +781 @@
      * @param mixed $value Query variable value.
      */
-    function set( $query_var, $value ) {
+    public function set( $query_var, $value ) {
         $this->query_vars[$query_var] = $value;
     }
@@ -797 +797 @@
      * @return string
      */
-    function get_search_sql( $string, $cols, $wild = false ) {
+    protected function get_search_sql( $string, $cols, $wild = false ) {
         $string = esc_sql( $string );
 
@@ -821 +821 @@
      * @return array Array of results.
      */
-    function get_results() {
+    public function get_results() {
         return $this->results;
     }
@@ -833 +833 @@
      * @return array Array of total users.
      */
-    function get_total() {
+    public function get_total() {
         return $this->total_users;
+    }
+
+    /**
+     * Make private properties readable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @return mixed
+     */
+    public function __get( $name ) {
+        return $this->$name;
+    }
+
+    /**
+     * Make private properties setable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @param string $value
+     * @return mixed
+     */
+    public function __set( $name, $value ) {
+        return $this->$name = $value;
+    }
+
+    /**
+     * Make private properties checkable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @return mixed
+     */
+    public function __isset( $name ) {
+        return isset( $this->$name );
+    }
+
+    /**
+     * Make private properties unsetable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @return mixed
+     */
+    public function __unset( $name ) {
+        unset( $this->$name );
+    }
+
+    /**
+     * Make private/protected methods readable for backwards compatibility
+     *
+     * @since 4.0.0
+     * @param string $name
+     * @param array $arguments
+     * @return mixed
+     */
+    public function __call( $name, $arguments ) {
+        return call_user_func_array( array( $this, $name ), $arguments );
     }
 }