Changeset 61068

Timestamp:

10/27/2025 09:06:15 AM (7 weeks ago)

Author:

gziolo

Message:

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 [61063].
See #64146.

Location:

trunk

Files:

• src/wp-includes/abilities/wp-core-abilities.php (modified) (3 diffs)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/abilities-api/wpCoreAbilities.php (modified) (2 diffs)

trunk/src/wp-includes/abilities/wp-core-abilities.php

@@ -9 +9 @@
 
 declare( strict_types = 1 );
+
 /**
  * Registers the core ability categories.
@@ -45 +46 @@
     $category_user = 'user';
 
-    $site_info_fields = array(
-        'name',
-        'description',
-        'url',
-        'wpurl',
-        'admin_email',
-        'charset',
-        'language',
-        'version',
-    );
+    $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.' ),
+        ),
+    );
+    $site_info_fields = array_keys( $site_info_properties );
 
     wp_register_ability(
@@ -79 +105 @@
             'output_schema'       => array(
                 'type'                 => 'object',
-                '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.' ),
-                    ),
-                ),
+                'properties'           => $site_info_properties,
                 'additionalProperties' => false,
             ),

trunk/src/wp-settings.php

@@ -291 +291 @@
 require ABSPATH . WPINC . '/abilities-api/class-wp-abilities-registry.php';
 require ABSPATH . WPINC . '/abilities-api.php';
-require ABSPATH . WPINC . '/abilities/wp-core-abilities.php';
+require ABSPATH . WPINC . '/abilities.php';
 require ABSPATH . WPINC . '/rest-api.php';
 require ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php';

trunk/tests/phpunit/tests/abilities-api/wpCoreAbilities.php

@@ -6 +6 @@
  * Tests for the core abilities shipped with the Abilities API.
  *
+ * @covers wp_register_core_ability_categories
+ * @covers wp_register_core_abilities
+ *
  * @group abilities-api
  */
-class Tests_Abilities_API_WpCoreAbilities extends WP_UnitTestCase {
+class Tests_Abilities_API_WpRegisterCoreAbilities extends WP_UnitTestCase {
 
     /**
@@ -28 +31 @@
         do_action( 'wp_abilities_api_categories_init' );
         do_action( 'wp_abilities_api_init' );
+    }
 
+    /**
+     * Tear down after the class.
+     *
+     * @since 6.9.0
+     */
+    public static function tear_down_after_class(): void {
         // Re-add the unhook functions for subsequent tests.
         add_action( 'wp_abilities_api_categories_init', '_unhook_core_ability_categories_registration', 1 );
         add_action( 'wp_abilities_api_init', '_unhook_core_abilities_registration', 1 );
+
+        // 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();
     }