<!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>[61068] trunk: Abilities API: Refactor registration for core abilities</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/61068">61068</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/61068","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-27 09:06:15 +0000 (Mon, 27 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'>Abilities API: Refactor registration for core abilities
Renames the files and adds a test cleanup so it doesn't accidentaly influence the rest of other tests.
Developed in https://github.com/WordPress/wordpress-develop/pull/10423.
Follow-up <a href="https://core.trac.wordpress.org/changeset/61063">[61063]</a>.
See <a href="https://core.trac.wordpress.org/ticket/64146">#64146</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesabilitieswpcoreabilitiesphp">trunk/src/wp-includes/abilities/wp-core-abilities.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunittestsabilitiesapiwpCoreAbilitiesphp">trunk/tests/phpunit/tests/abilities-api/wpCoreAbilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesabilitieswpcoreabilitiesphp"></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/abilities/wp-core-abilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities/wp-core-abilities.php 2025-10-27 08:18:29 UTC (rev 61067)
+++ trunk/src/wp-includes/abilities/wp-core-abilities.php 2025-10-27 09:06:15 UTC (rev 61068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,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"> declare( strict_types = 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers the core ability categories.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,16 +45,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $category_site = 'site';
</span><span class="cx" style="display: block; padding: 0 10px"> $category_user = 'user';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_info_fields = array(
- 'name',
- 'description',
- 'url',
- 'wpurl',
- 'admin_email',
- 'charset',
- 'language',
- 'version',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_info_properties = array(
+ 'name' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site title.' ),
+ ),
+ 'description' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site tagline.' ),
+ ),
+ 'url' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site home URL.' ),
+ ),
+ 'wpurl' => array(
+ 'type' => 'string',
+ 'description' => __( 'The WordPress installation URL.' ),
+ ),
+ 'admin_email' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site administrator email address.' ),
+ ),
+ 'charset' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site character encoding.' ),
+ ),
+ 'language' => array(
+ 'type' => 'string',
+ 'description' => __( 'The site language locale code.' ),
+ ),
+ 'version' => array(
+ 'type' => 'string',
+ 'description' => __( 'The WordPress version.' ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_info_fields = array_keys( $site_info_properties );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_ability(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/get-site-info',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,40 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'output_schema' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'object',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'properties' => array(
- 'name' => array(
- 'type' => 'string',
- 'description' => __( 'The site title.' ),
- ),
- 'description' => array(
- 'type' => 'string',
- 'description' => __( 'The site tagline.' ),
- ),
- 'url' => array(
- 'type' => 'string',
- 'description' => __( 'The site home URL.' ),
- ),
- 'wpurl' => array(
- 'type' => 'string',
- 'description' => __( 'The WordPress installation URL.' ),
- ),
- 'admin_email' => array(
- 'type' => 'string',
- 'description' => __( 'The site administrator email address.' ),
- ),
- 'charset' => array(
- 'type' => 'string',
- 'description' => __( 'The site character encoding.' ),
- ),
- 'language' => array(
- 'type' => 'string',
- 'description' => __( 'The site language locale code.' ),
- ),
- 'version' => array(
- 'type' => 'string',
- 'description' => __( 'The WordPress version.' ),
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'properties' => $site_info_properties,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'additionalProperties' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'execute_callback' => static function ( $input = array() ) use ( $site_info_fields ): array {
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2025-10-27 08:18:29 UTC (rev 61067)
+++ trunk/src/wp-settings.php 2025-10-27 09:06:15 UTC (rev 61068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/abilities-api/class-wp-ability.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/abilities-api/class-wp-abilities-registry.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/abilities-api.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require ABSPATH . WPINC . '/abilities/wp-core-abilities.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require ABSPATH . WPINC . '/abilities.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/rest-api.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php';
</span></span></pre></div>
<a id="trunktestsphpunittestsabilitiesapiwpCoreAbilitiesphp"></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/abilities-api/wpCoreAbilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/abilities-api/wpCoreAbilities.php 2025-10-27 08:18:29 UTC (rev 61067)
+++ trunk/tests/phpunit/tests/abilities-api/wpCoreAbilities.php 2025-10-27 09:06:15 UTC (rev 61068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests for the core abilities shipped with the Abilities API.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers wp_register_core_ability_categories
+ * @covers wp_register_core_abilities
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group abilities-api
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Tests_Abilities_API_WpCoreAbilities extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Tests_Abilities_API_WpRegisterCoreAbilities extends WP_UnitTestCase {
</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"> * Set up before the class.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +30,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_abilities_api_init', 'wp_register_core_abilities' );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_abilities_api_categories_init' );
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_abilities_api_init' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Tear down after the class.
+ *
+ * @since 6.9.0
+ */
+ public static function tear_down_after_class(): void {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Re-add the unhook functions for subsequent tests.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_abilities_api_categories_init', '_unhook_core_ability_categories_registration', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_abilities_api_init', '_unhook_core_abilities_registration', 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Remove the core abilities and their categories.
+ foreach ( wp_get_abilities() as $ability ) {
+ wp_unregister_ability( $ability->get_name() );
+ }
+ foreach ( wp_get_ability_categories() as $ability_category ) {
+ wp_unregister_ability_category( $ability_category->get_slug() );
+ }
+
+ parent::tear_down_after_class();
</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>
</div>
</body>
</html>