Changeset 61037 for trunk/src/wp-includes/class-wp-user.php

Timestamp:

10/21/2025 03:23:43 PM (3 months ago)

Author:

jorbin

Message:

Users: Revert Lazy load user capabilities in WP_User object.

The change from public to protected broke tests for extenders and this also broke WP_User::to_array().

Reverts [60915].

Props davidbaumwald, ellatrix, timothyblynjacobs, welcher, spacedmonkey, bradshawtm, peterwilsoncc, jorbin.
See #58001.

File:

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

trunk/src/wp-includes/class-wp-user.php

@@ -38 +38 @@
  * @property string $syntax_highlighting
  * @property string $use_ssl
- * @property array<string, bool> $caps
- * @property string[] $roles
- * @property array<string, bool> $allcaps
  */
 #[AllowDynamicProperties]
@@ -64 +61 @@
      *
      * @since 2.0.0
-     * @var array<string, bool>|null Array of key/value pairs where keys represent a capability name
-     *                               and boolean values represent whether the user has that capability.
-     */
-    protected $caps = null;
+     * @var bool[] Array of key/value pairs where keys represent a capability name
+     *             and boolean values represent whether the user has that capability.
+     */
+    public $caps = array();
 
     /**
@@ -83 +80 @@
      * @var string[]
      */
-    protected $roles = array();
+    public $roles = array();
 
     /**
@@ -89 +86 @@
      *
      * @since 2.0.0
-     * @var array<string, bool> Array of key/value pairs where keys represent a capability name
-     *                          and boolean values represent whether the user has that capability.
-     */
-    protected $allcaps = array();
+     * @var bool[] Array of key/value pairs where keys represent a capability name
+     *             and boolean values represent whether the user has that capability.
+     */
+    public $allcaps = array();
 
     /**
@@ -292 +289 @@
         }
 
-        if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
-            return true;
-        }
-
         if ( isset( $this->data->$key ) ) {
             return true;
@@ -327 +320 @@
             );
             return $this->ID;
-        }
-
-        if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
-            $this->load_capability_data();
-            return $this->$key;
         }
 
@@ -376 +364 @@
         }
 
-        // Ensure capability data is loaded before setting related properties.
-        if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
-            $this->load_capability_data();
-            $this->$key = $value;
-            return;
-        }
-
         $this->data->$key = $value;
     }
@@ -406 +387 @@
         }
 
-        if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
-            $this->$key = null;
-        }
-
         if ( isset( $this->data->$key ) ) {
             unset( $this->data->$key );
@@ -538 +515 @@
 
         $wp_roles = wp_roles();
-
-        // Edge case: In case someone calls this method before lazy initialization, we need to initialize on demand.
-        if ( ! isset( $this->caps ) ) {
-            $this->caps = $this->get_caps_data();
-        }
 
         // Filter out caps that are not role names and assign to $this->roles.
@@ -577 +549 @@
             return;
         }
-        $this->load_capability_data();
 
         if ( in_array( $role, $this->roles, true ) ) {
@@ -607 +578 @@
      */
     public function remove_role( $role ) {
-        $this->load_capability_data();
         if ( ! in_array( $role, $this->roles, true ) ) {
             return;
@@ -640 +610 @@
      */
     public function set_role( $role ) {
-        $this->load_capability_data();
         if ( 1 === count( $this->roles ) && current( $this->roles ) === $role ) {
             return;
@@ -742 +711 @@
      */
     public function add_cap( $cap, $grant = true ) {
-        $this->load_capability_data();
         $this->caps[ $cap ] = $grant;
         update_user_meta( $this->ID, $this->cap_key, $this->caps );
@@ -757 +725 @@
      */
     public function remove_cap( $cap ) {
-        $this->load_capability_data();
         if ( ! isset( $this->caps[ $cap ] ) ) {
             return;
@@ -776 +743 @@
     public function remove_all_caps() {
         global $wpdb;
-        $this->caps = null;
+        $this->caps = array();
         delete_user_meta( $this->ID, $this->cap_key );
         delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
-        $this->load_capability_data();
+        $this->get_role_caps();
     }
 
@@ -810 +777 @@
      */
     public function has_cap( $cap, ...$args ) {
-        $this->load_capability_data();
-
         if ( is_numeric( $cap ) ) {
             _deprecated_argument( __FUNCTION__, '2.0.0', __( 'Usage of user levels is deprecated. Use capabilities instead.' ) );
@@ -913 +878 @@
 
         $this->cap_key = $wpdb->get_blog_prefix( $this->site_id ) . 'capabilities';
-        $this->caps    = null;
+
+        $this->caps = $this->get_caps_data();
+
+        $this->get_role_caps();
     }
 
@@ -944 +912 @@
         return $caps;
     }
-
-    /**
-     * Loads capability data if it has not been loaded yet.
-     *
-     * @since 6.9.0
-     */
-    private function load_capability_data() {
-        if ( isset( $this->caps ) ) {
-            return;
-        }
-        $this->caps = $this->get_caps_data();
-        $this->get_role_caps();
-    }
 }