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

Co-authored-by: Weston Ruter <[email protected]>

Author: gziolo

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

@@ -30,7 +30,7 @@ final class WP_Abilities_Category_Registry {
 	 * Holds the registered categories.
 	 *
 	 * @since 6.9.0
-	 * @var \WP_Ability_Category[]
+	 * @var WP_Ability_Category[]
 	 */
 	private $registered_categories = array();
 

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

@@ -30,7 +30,7 @@ final class WP_Abilities_Registry {
 	 * Holds the registered abilities.
 	 *
 	 * @since 6.9.0
-	 * @var \WP_Ability[]
+	 * @var WP_Ability[]
 	 */
 	private $registered_abilities = array();
 

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

@@ -315,8 +315,6 @@ public function get_collection_params(): array {
 				'description'       => __( 'Current page of the collection.' ),
 				'type'              => 'integer',
 				'default'           => 1,
-				'sanitize_callback' => 'absint',
-				'validate_callback' => 'rest_validate_request_arg',
 				'minimum'           => 1,
 			),
 			'per_page' => array(
@@ -325,8 +323,6 @@ public function get_collection_params(): array {
 				'default'           => self::DEFAULT_PER_PAGE,
 				'minimum'           => 1,
 				'maximum'           => 100,
-				'sanitize_callback' => 'absint',
-				'validate_callback' => 'rest_validate_request_arg',
 			),
 			'category' => array(
 				'description'       => __( 'Limit results to abilities in specific category.' ),

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

@@ -15,7 +15,7 @@ class Tests_Abilities_API_WpAbilitiesRegistry extends WP_UnitTestCase {
 	/**
 	 * Mock abilities registry.
 	 *
-	 * @var \WP_Abilities_Registry
+	 * @var WP_Abilities_Registry
 	 */
 	private $registry = null;
 

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

@@ -17,7 +17,7 @@ class Tests_Abilities_API_WpAbilityCategory extends WP_UnitTestCase {
 	/**
 	 * Category registry instance.
 	 *
-	 * @var \WP_Abilities_Category_Registry
+	 * @var WP_Abilities_Category_Registry
 	 */
 	private $registry;
 

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

@@ -13,7 +13,7 @@ class Tests_REST_API_WpRestAbilitiesListController extends WP_UnitTestCase {
 	/**
 	 * REST Server instance.
 	 *
-	 * @var \WP_REST_Server
+	 * @var WP_REST_Server
 	 */
 	protected $server;
 
@@ -47,10 +47,6 @@ public static function set_up_before_class(): void {
 			'abilities_api_categories_init',
 			array( __CLASS__, 'register_test_categories' )
 		);
-
-		// Initialize Abilities API.
-		do_action( 'abilities_api_init' );
-
 	}
 
 	/**
@@ -78,6 +74,8 @@ public function set_up(): void {
 
 		do_action( 'rest_api_init' );
 
+		// Initialize Abilities API.
+		do_action( 'abilities_api_init' );
 		$this->register_test_abilities();
 
 		// Set default user for tests

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

@@ -13,7 +13,7 @@ class Tests_REST_API_WpRestAbilitiesRunController extends WP_UnitTestCase {
 	/**
 	 * REST Server instance.
 	 *
-	 * @var \WP_REST_Server
+	 * @var WP_REST_Server
 	 */
 	protected $server;
 
@@ -59,9 +59,6 @@ public static function set_up_before_class(): void {
 			'abilities_api_categories_init',
 			array( __CLASS__, 'register_test_categories' )
 		);
-
-		// Initialize Abilities API.
-		do_action( 'abilities_api_init' );
 	}
 
 	/**
@@ -88,6 +85,8 @@ public function set_up(): void {
 
 		do_action( 'rest_api_init' );
 
+		// Initialize Abilities API.
+		do_action( 'abilities_api_init' );
 		$this->register_test_abilities();
 
 		// Set default user for tests