<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60915] trunk: Users: Lazy load user capabilities in WP_User object.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60915">60915</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60915","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>spacedmonkey</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-08 19:59:28 +0000 (Wed, 08 Oct 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Users: Lazy load user capabilities in WP_User object.
Convert the WP_User object properties caps, roles, and allcaps to protected, and introduce lazy loading for capabilities. These properties are now populated only when first accessed.
The existing magic methods (__get, __set, and __unset) have been updated to maintain backward compatibility, ensuring that reading or modifying these formerly public properties continues to work as expected.
Ensure that these properties are initialised when calling remove_all_caps(), remove_cap(), has_cap(), add_role(), and set_role() methods.
Props spacedmonkey, flixos90, peterwilsoncc, mukesh27, westonruter, swissspidy, prettyboymp.
Fixes <a href="https://core.trac.wordpress.org/ticket/58001">#58001</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2025-10-08 03:00:58 UTC (rev 60914)
+++ trunk/src/wp-includes/class-wp-user.php 2025-10-08 19:59:28 UTC (rev 60915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @property string $rich_editing
</span><span class="cx" style="display: block; padding: 0 10px"> * @property string $syntax_highlighting
</span><span class="cx" style="display: block; padding: 0 10px"> * @property string $use_ssl
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @property array<string, bool> $caps
+ * @property string[] $roles
+ * @property array<string, bool> $allcaps
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> #[AllowDynamicProperties]
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_User {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,10 +63,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Capabilities that the individual user has been granted outside of those inherited from their role.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool[] Array of key/value pairs where keys represent a capability name
- * and boolean values represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $caps = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $caps = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * User metadata option name.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,16 +82,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string[]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $roles = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $roles = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * All capabilities the user has, including individual and role based.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool[] Array of key/value pairs where keys represent a capability name
- * and boolean values represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $allcaps = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $allcaps = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The filter context applied to user data fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,6 +291,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 'ID';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
+ return true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->data->$key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,6 +328,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
+ $this->load_capability_data();
+ return $this->$key;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->data->$key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->data->$key;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,6 +375,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->data->$key = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,6 +405,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key, array( 'caps', 'allcaps', 'roles' ), true ) ) {
+ $this->$key = null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->data->$key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->data->$key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,6 +538,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles = wp_roles();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Filter out caps that are not role names and assign to $this->roles.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->caps ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,6 +576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $role ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $role, $this->roles, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,6 +606,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $role Role name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_role( $role ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $role, $this->roles, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,6 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $role Role name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_role( $role ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === count( $this->roles ) && current( $this->roles ) === $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,6 +741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $grant Whether to grant capability to user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_cap( $cap, $grant = true ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->caps[ $cap ] = $grant;
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $this->ID, $this->cap_key, $this->caps );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->get_role_caps();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,6 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $cap Capability name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_cap( $cap ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $this->caps[ $cap ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,10 +775,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_all_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->caps = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->caps = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_user_meta( $this->ID, $this->cap_key );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_role_caps();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,6 +809,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * the given capability for that object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_cap( $cap, ...$args ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->load_capability_data();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $cap ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '2.0.0', __( 'Usage of user levels is deprecated. Use capabilities instead.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = $this->translate_level_to_cap( $cap );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,10 +912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cap_key = $wpdb->get_blog_prefix( $this->site_id ) . 'capabilities';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $this->caps = $this->get_caps_data();
-
- $this->get_role_caps();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->caps = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,4 +943,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $caps;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2025-10-08 03:00:58 UTC (rev 60914)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2025-10-08 19:59:28 UTC (rev 60915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,6 +993,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test adding capabilities, roles, and allcaps manually to a user.
+ *
+ * @ticket 58001
+ *
+ * @dataProvider data_add_user_properties_manually
+ *
+ * @param string $property_name The property name to set.
+ * @param array $property_value The property value to set.
+ * @param bool $check_null Whether to check that the property is null after unsetting it.
+ */
+ public function test_add_user_properties_manually( $property_name, $property_value, $check_null ) {
+ $id = self::factory()->user->create();
+ $user = new WP_User( $id );
+ $user->{$property_name} = $property_value;
+
+ $this->assertSameSets( $property_value, $user->{$property_name}, "User property {$property_name} was not set correctly." );
+ unset( $user->{$property_name} );
+ if ( $check_null ) {
+ $this->assertNull( $user->{$property_name}, "User property {$property_name} should be null after unsetting it." );
+ }
+ }
+
+ /**
+ * Data provider for test_add_user_properties_manually.
+ *
+ * @return array<string, array{0:string,1:array}>
+ */
+ public function data_add_user_properties_manually() {
+ return array(
+ 'caps' => array( 'caps', array( 'foo' => true ), false ),
+ 'roles' => array( 'roles', array( 'foo' => true ), true ),
+ 'allcaps' => array( 'allcaps', array( 'foo' => true ), true ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test add_role with implied capabilities grant successfully grants capabilities.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 43421
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1101,6 +1137,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58001
+ */
+ public function test_get_role_caps() {
+ $id_1 = self::$users['contributor']->ID;
+ $user_1 = new WP_User( $id_1 );
+
+ $role_caps = $user_1->get_role_caps();
+ $this->assertIsArray( $role_caps, 'User role capabilities should be an array' );
+ $this->assertArrayHasKey( 'edit_posts', $role_caps, 'User role capabilities should contain the edit_posts capability' );
+ }
+
+ /**
+ * @ticket 58001
+ */
+ public function test_user_lazy_capabilities() {
+ $id_1 = self::$users['contributor']->ID;
+ $user_1 = new WP_User( $id_1 );
+
+ $this->assertTrue( isset( $user_1->roles ), 'User roles should be set' );
+ $this->assertTrue( isset( $user_1->allcaps ), 'User all capabilities should be set' );
+ $this->assertTrue( isset( $user_1->caps ), 'User capabilities should be set' );
+ $this->assertIsArray( $user_1->roles, 'User roles should be an array' );
+ $this->assertSame( array( 'contributor' ), $user_1->roles, 'User roles should match' );
+ $this->assertIsArray( $user_1->allcaps, 'User allcaps should be an array' );
+ $this->assertIsArray( $user_1->caps, 'User caps should be an array' );
+
+ $caps = $this->getAllCapsAndRoles();
+ foreach ( $caps as $cap => $roles ) {
+ if ( in_array( 'contributor', $roles, true ) ) {
+ $this->assertTrue( $user_1->has_cap( $cap ), "User should have the {$cap} capability" );
+ }
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add an extra capability to a user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_user_add_cap() {
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2025-10-08 03:00:58 UTC (rev 60914)
+++ trunk/tests/phpunit/tests/user/multisite.php 2025-10-08 19:59:28 UTC (rev 60915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,12 +369,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $user_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertContains( 'subscriber', $user->roles, 'User should have subscriber role' );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertContains( 'subscriber', $user->roles );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertContains( 'subscriber', $user->roles, 'User should still have subscriber role' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2025-10-08 03:00:58 UTC (rev 60914)
+++ trunk/tests/phpunit/tests/user/query.php 2025-10-08 19:59:28 UTC (rev 60915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'update_user_metadata_cache', array( $filter, 'filter' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new WP_User_Query(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = new WP_User_Query(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => self::$author_ids,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,6 +169,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users = $query->get_results();
+ foreach ( $users as $user ) {
+ $this->assertIsArray( $user->roles );
+ foreach ( $user->roles as $role ) {
+ $this->assertIsString( $role );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = $filter->get_args();
</span><span class="cx" style="display: block; padding: 0 10px"> $last_args = end( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $last_args[1] );
</span></span></pre>
</div>
</div>
</body>
</html>