Introduce wp_has_ability() and wp_has_ability_category() public methods

Author: gziolo

src/wp-includes/abilities-api.php

@@ -77,6 +77,20 @@ function wp_unregister_ability( string $name ): ?WP_Ability {
 	return WP_Abilities_Registry::get_instance()->unregister( $name );
 }
 
+/**
+ * Checks if an ability is registered.
+ *
+ * @since 6.9.0
+ *
+ * @see WP_Abilities_Registry::is_registered()
+ *
+ * @param string $name The name of the registered ability, with its namespace.
+ * @return bool True if the ability is registered, false otherwise.
+ */
+function wp_has_ability( string $name ): bool {
+	return WP_Abilities_Registry::get_instance()->is_registered( $name );
+}
+
 /**
  * Retrieves a registered ability using Abilities API.
  *
@@ -140,6 +154,20 @@ function wp_unregister_ability_category( string $slug ): ?WP_Ability_Category {
 	return WP_Ability_Categories_Registry::get_instance()->unregister( $slug );
 }
 
+/**
+ * Checks if an ability category is registered.
+ *
+ * @since 6.9.0
+ *
+ * @see WP_Ability_Categories_Registry::is_registered()
+ *
+ * @param string $slug The slug of the ability category.
+ * @return bool True if the ability category is registered, false otherwise.
+ */
+function wp_has_ability_category( string $slug ): bool {
+	return WP_Ability_Categories_Registry::get_instance()->is_registered( $slug );
+}
+
 /**
  * Retrieves a registered ability category.
  *

src/wp-includes/abilities-api/class-wp-abilities-registry.php

@@ -214,8 +214,12 @@ public function get_all_registered(): array {
 	/**
 	 * Checks if an ability is registered.
 	 *
+	 * Do not use this method directly. Instead, use the `wp_has_ability()` function.
+	 *
 	 * @since 6.9.0
 	 *
+	 * @see wp_has_ability()
+	 *
 	 * @param string $name The name of the registered ability, with its namespace.
 	 * @return bool True if the ability is registered, false otherwise.
 	 */

src/wp-includes/abilities-api/class-wp-ability-categories-registry.php

@@ -121,7 +121,7 @@ public function register( string $slug, array $args ): ?WP_Ability_Category {
 	}
 
 	/**
-	 * Unregisters a ability category.
+	 * Unregisters an ability category.
 	 *
 	 * Do not use this method directly. Instead, use the `wp_unregister_ability_category()` function.
 	 *
@@ -165,10 +165,14 @@ public function get_all_registered(): array {
 	}
 
 	/**
-	 * Checks if a ability category is registered.
+	 * Checks if an ability category is registered.
+	 *
+	 * Do not use this method directly. Instead, use the `wp_has_ability_category()` function.
 	 *
 	 * @since 6.9.0
 	 *
+	 * @see wp_has_ability_category()
+	 *
 	 * @param string $slug The slug of the ability category.
 	 * @return bool True if the ability category is registered, false otherwise.
 	 */

src/wp-includes/rest-api/endpoints/class-wp-rest-abilities-list-controller.php

@@ -312,17 +312,17 @@ public function get_collection_params(): array {
 		return array(
 			'context'  => $this->get_context_param( array( 'default' => 'view' ) ),
 			'page'     => array(
-				'description'       => __( 'Current page of the collection.' ),
-				'type'              => 'integer',
-				'default'           => 1,
-				'minimum'           => 1,
+				'description' => __( 'Current page of the collection.' ),
+				'type'        => 'integer',
+				'default'     => 1,
+				'minimum'     => 1,
 			),
 			'per_page' => array(
-				'description'       => __( 'Maximum number of items to be returned in result set.' ),
-				'type'              => 'integer',
-				'default'           => self::DEFAULT_PER_PAGE,
-				'minimum'           => 1,
-				'maximum'           => 100,
+				'description' => __( 'Maximum number of items to be returned in result set.' ),
+				'type'        => 'integer',
+				'default'     => self::DEFAULT_PER_PAGE,
+				'minimum'     => 1,
+				'maximum'     => 100,
 			),
 			'category' => array(
 				'description'       => __( 'Limit results to abilities in specific ability category.' ),

tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php

@@ -33,7 +33,7 @@ public function set_up(): void {
 		add_action(
 			'wp_abilities_api_categories_init',
 			function () {
-				if ( ! WP_Ability_Categories_Registry::get_instance()->is_registered( 'math' ) ) {
+				if ( ! wp_has_ability_category( 'math' ) ) {
 					wp_register_ability_category(
 						'math',
 						array(
@@ -464,7 +464,7 @@ public function test_get_registered_for_known_ability() {
 	}
 
 	/**
-	 * Unregistering should fail if a ability is not registered.
+	 * Unregistering should fail if an ability is not registered.
 	 *
 	 * @ticket 64098
 	 *

tests/phpunit/tests/abilities-api/wpAbility.php

@@ -22,7 +22,7 @@ public function set_up(): void {
 		add_action(
 			'wp_abilities_api_categories_init',
 			function () {
-				if ( ! WP_Ability_Categories_Registry::get_instance()->is_registered( 'math' ) ) {
+				if ( ! wp_has_ability_category( 'math' ) ) {
 					wp_register_ability_category(
 						'math',
 						array(

tests/phpunit/tests/abilities-api/wpAbilityCategory.php

@@ -355,6 +355,37 @@ public function test_get_nonexistent_category(): void {
 		$this->assertDoingItWrongTriggered( 'WP_Ability_Categories_Registry::get_registered' );
 	}
 
+	/**
+	 * Tests checking if an ability category is registered.
+	 *
+	 * @ticket 64098
+	 */
+	public function test_has_registered_ability_category(): void {
+		$category_slug = 'test-math';
+		$this->register_category_during_hook(
+			$category_slug,
+			array(
+				'label'       => 'Math',
+				'description' => 'Mathematical operations.',
+			)
+		);
+
+		$result = wp_has_ability_category( $category_slug );
+
+		$this->assertTrue( $result );
+	}
+
+	/**
+	 * Tests checking if a non-existent ability category is registered.
+	 *
+	 * @ticket 64098
+	 */
+	public function test_has_registered_nonexistent_ability_category(): void {
+		$result = wp_has_ability_category( 'test/non-existent' );
+
+		$this->assertFalse( $result );
+	}
+
 	/**
 	 * Test retrieving all registered categories.
 	 *
@@ -416,7 +447,7 @@ public function test_ability_requires_existing_category(): void {
 
 		// Ensure category doesn't exist - test should fail if it does.
 		$this->assertFalse(
-			WP_Ability_Categories_Registry::get_instance()->is_registered( 'test-nonexistent' ),
+			wp_has_ability_category( 'test-nonexistent' ),
 			'The test-nonexistent category should not be registered - test isolation may be broken'
 		);
 

tests/phpunit/tests/abilities-api/wpRegisterAbility.php

@@ -34,7 +34,7 @@ public function set_up(): void {
 		add_action(
 			'wp_abilities_api_categories_init',
 			function () {
-				if ( ! WP_Ability_Categories_Registry::get_instance()->is_registered( 'math' ) ) {
+				if ( ! wp_has_ability_category( 'math' ) ) {
 					wp_register_ability_category(
 						'math',
 						array(
@@ -471,6 +471,34 @@ public function test_get_existing_ability() {
 		);
 	}
 
+	/**
+	 * Tests checking if an ability is registered.
+	 *
+	 * @ticket 64098
+	 */
+	public function test_has_registered_ability() {
+		do_action( 'wp_abilities_api_init' );
+
+		wp_register_ability( self::$test_ability_name, self::$test_ability_args );
+
+		$result = wp_has_ability( self::$test_ability_name );
+
+		$this->assertTrue( $result );
+	}
+
+	/**
+	 * Tests checking if a non-existent ability is registered.
+	 *
+	 * @ticket 64098
+	 */
+	public function test_has_registered_nonexistent_abi() {
+		do_action( 'wp_abilities_api_init' );
+
+		$result = wp_has_ability( 'test/non-existent' );
+
+		$this->assertFalse( $result );
+	}
+
 	/**
 	 * Tests retrieving all registered abilities.
 	 *
@@ -513,7 +541,7 @@ public function test_register_ability_nonexistent_category(): void {
 
 		// Ensure category doesn't exist - test should fail if it does.
 		$this->assertFalse(
-			WP_Ability_Categories_Registry::get_instance()->is_registered( 'nonexistent' ),
+			wp_has_ability_category( 'nonexistent' ),
 			'The nonexistent category should not be registered - test isolation may be broken'
 		);
 

tests/phpunit/tests/rest-api/wpRestAbilitiesListController.php

@@ -760,7 +760,7 @@ public function test_filter_by_category(): void {
 	public function test_filter_by_nonexistent_category(): void {
 		// Ensure category doesn't exist - test should fail if it does.
 		$this->assertFalse(
-			WP_Ability_Categories_Registry::get_instance()->is_registered( 'nonexistent' ),
+			wp_has_ability_category( 'nonexistent' ),
 			'The nonexistent category should not be registered - test isolation may be broken'
 		);