Changeset 28503

Timestamp:

05/19/2014 05:19:36 AM (12 years ago)

Author:

wonderboymusic

Message:

Add access modifiers to methods/members in WP_Roles. Add a magic __call() method for BC.

See #27881, #22234.

File:

• trunk/src/wp-includes/capabilities.php (modified) (15 diffs)

trunk/src/wp-includes/capabilities.php

@@ -35 +35 @@
          * @var array
          */
-        var $roles;
+        public $roles;
 
         /**
@@ -44 +44 @@
          * @var array
          */
-        var $role_objects = array();
+        public $role_objects = array();
 
         /**
@@ -53 +53 @@
          * @var array
          */
-        var $role_names = array();
+        public $role_names = array();
 
         /**
@@ -62 +62 @@
          * @var string
          */
-        var $role_key;
+        public $role_key;
 
         /**
@@ -71 +71 @@
          * @var bool
          */
-        var $use_db = true;
+        public $use_db = true;
 
         /**
@@ -78 +78 @@
          * @since 2.0.0
          */
-        function __construct() {
+        public function __construct() {
                 $this->_init();
+        }
+
+        /**
+         * 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 );
         }
 
@@ -94 +106 @@
          * @global array $wp_user_roles Used to set the 'roles' property value.
          */
-        function _init () {
+        protected function _init() {
                 global $wpdb, $wp_user_roles;
                 $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
@@ -124 +136 @@
          * @access public
          */
-        function reinit() {
+        public function reinit() {
                 // There is no need to reinit if using the wp_user_roles global.
                 if ( ! $this->use_db )
@@ -161 +173 @@
          * @return WP_Role|null WP_Role object if role is added, null if already exists.
          */
-        function add_role( $role, $display_name, $capabilities = array() ) {
+        public function add_role( $role, $display_name, $capabilities = array() ) {
                 if ( isset( $this->roles[$role] ) )
                         return;
@@ -184 +196 @@
          * @param string $role Role name.
          */
-        function remove_role( $role ) {
+        public function remove_role( $role ) {
                 if ( ! isset( $this->role_objects[$role] ) )
                         return;
@@ -209 +221 @@
          * @param bool $grant Optional, default is true. Whether role is capable of performing capability.
          */
-        function add_cap( $role, $cap, $grant = true ) {
+        public function add_cap( $role, $cap, $grant = true ) {
                 if ( ! isset( $this->roles[$role] ) )
                         return;
@@ -227 +239 @@
          * @param string $cap Capability name.
          */
-        function remove_cap( $role, $cap ) {
+        public function remove_cap( $role, $cap ) {
                 if ( ! isset( $this->roles[$role] ) )
                         return;
@@ -245 +257 @@
          * @return WP_Role|null WP_Role object if found, null if the role does not exist.
          */
-        function get_role( $role ) {
+        public function get_role( $role ) {
                 if ( isset( $this->role_objects[$role] ) )
                         return $this->role_objects[$role];
@@ -260 +272 @@
          * @return array List of role names.
          */
-        function get_names() {
+        public function get_names() {
                 return $this->role_names;
         }
@@ -273 +285 @@
          * @return bool
          */
-        function is_role( $role ) {
+        public function is_role( $role ) {
                 return isset( $this->role_names[$role] );
         }