diff --git a/includes/abilities-api.php b/includes/abilities-api.php index c37cd5a6..ef054c8b 100644 --- a/includes/abilities-api.php +++ b/includes/abilities-api.php @@ -7,6 +7,8 @@ * @package WordPress * @subpackage Abilities API * @since 0.1.0 + * + * phpcs:disable WordPress.NamingConventions.PrefixAllGlobals */ declare( strict_types = 1 ); @@ -34,7 +36,7 @@ * input_schema?: array, * output_schema?: array, * execute_callback?: callable( array $input): (mixed|\WP_Error), - * permission_callback?: callable( ?array $input ): bool, + * permission_callback?: callable( array $input ): (bool|\WP_Error), * meta?: array, * ability_class?: class-string<\WP_Ability>, * ... diff --git a/includes/abilities-api/class-wp-abilities-registry.php b/includes/abilities-api/class-wp-abilities-registry.php index 39f1b930..107e28fc 100644 --- a/includes/abilities-api/class-wp-abilities-registry.php +++ b/includes/abilities-api/class-wp-abilities-registry.php @@ -57,7 +57,7 @@ final class WP_Abilities_Registry { * input_schema?: array, * output_schema?: array, * execute_callback?: callable( array $input): (mixed|\WP_Error), - * permission_callback?: ?callable( ?array $input ): bool, + * permission_callback?: ?callable( array $input ): (bool|\WP_Error), * meta?: array, * ability_class?: class-string<\WP_Ability>, * ... diff --git a/includes/abilities-api/class-wp-ability.php b/includes/abilities-api/class-wp-ability.php index ad3e9d02..2193b062 100644 --- a/includes/abilities-api/class-wp-ability.php +++ b/includes/abilities-api/class-wp-ability.php @@ -65,7 +65,7 @@ class WP_Ability { * The ability execute callback. * * @since 0.1.0 - * @var callable + * @var callable( array $input): (mixed|\WP_Error) */ protected $execute_callback; @@ -73,7 +73,7 @@ class WP_Ability { * The optional ability permission callback. * * @since 0.1.0 - * @var ?callable + * @var ?callable( array $input ): (bool|\WP_Error) */ protected $permission_callback = null; @@ -107,7 +107,7 @@ class WP_Ability { * input_schema?: array, * output_schema?: array, * execute_callback: callable( array $input): (mixed|\WP_Error), - * permission_callback?: ?callable( ?array $input ): bool, + * permission_callback?: ?callable( array $input ): (bool|\WP_Error), * meta?: array, * ..., * } $properties @@ -240,7 +240,7 @@ protected function validate_input( array $input = array() ) { * @since 0.1.0 * * @param array $input Optional. The input data for permission checking. - * @return true|\WP_Error Whether the ability has the necessary permission. + * @return bool|\WP_Error Whether the ability has the necessary permission. */ public function has_permission( array $input = array() ) { $is_valid = $this->validate_input( $input ); diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 05730e7b..2e19d98c 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -60,7 +60,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 39ea2957..85dfff7f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -4,7 +4,6 @@ * * @package abilities-api * - * phpcs:disable WordPress.NamingConventions.PrefixAllGlobals * phpcs:disable WordPressVIPMinimum.Files.IncludingFile.UsingVariable */ diff --git a/tests/unit/abilities-api/wpAbilitiesRegistry.php b/tests/unit/abilities-api/wpAbilitiesRegistry.php index 61f8110b..dff53e97 100644 --- a/tests/unit/abilities-api/wpAbilitiesRegistry.php +++ b/tests/unit/abilities-api/wpAbilitiesRegistry.php @@ -1,6 +1,8 @@ assertWPError( $actual, - 'Execution should fail due to output not matching schema.', + 'Execution should fail due to output not matching schema.' ); $this->assertSame( 'ability_invalid_output', $actual->get_error_code() ); $this->assertSame( @@ -376,8 +378,6 @@ public function test_unregister_existing_ability() { * Tests retrieving existing ability. */ public function test_get_existing_ability() { - global $wp_abilities; - $name = self::$test_ability_name; $properties = self::$test_ability_properties; $callback = static function ( $instance ) use ( $name, $properties ) { diff --git a/tests/unit/rest-api/wpRestAbilitiesListController.php b/tests/unit/rest-api/wpRestAbilitiesListController.php index 1fac1ac1..71e41af2 100644 --- a/tests/unit/rest-api/wpRestAbilitiesListController.php +++ b/tests/unit/rest-api/wpRestAbilitiesListController.php @@ -1,6 +1,8 @@