Address review feedback on the core/settings ability

- Simplify the input schema: replace the group-XOR-name `oneOf` with optional,
  combinable `group` and `fields` filters (rename `settings` -> `fields`, matching
  core/get-site-info). Default to an empty object so the type:object schema default
  serializes as {}.
- Memoize the exposed settings so the input/output schema and execute() derive from a
  single walk of get_registered_settings().
- Cast object-typed values to objects so they serialize as {} (not []) and satisfy the
  output schema validated by execute().
- Drop the redundant `site` ability-category fallback (core registers it and the plugin
  requires WP 7.0).
- Use __() instead of esc_html__() for ability strings, and @SInCE x.x.x per CONTRIBUTING.md.
- Harden value handling so the new code passes PHPStan at the strictest level.
- Tests: assert keys order-insensitively and cover combined group+fields filtering.

Author: jorgefilipecosta

includes/Abilities/Settings/Settings.php

@@ -4,7 +4,7 @@
  *
  * @package WordPress\AI
  *
- * @since 1.1.0
+ * @since x.x.x
  */
 
 declare( strict_types=1 );
@@ -24,67 +24,53 @@
  *
  * This class is kept almost identical to the WordPress core class `WP_Settings_Abilities`
  * so the two implementations stay in sync. Differences from the core class are marked with
- * `// Plugin:` comments. Additionally, all user-facing strings use esc_html__() with the
- * 'ai' text domain rather than core's __().
+ * `// Plugin:` comments. Additionally, all user-facing strings use the 'ai' text domain.
  *
  * @internal This class should not be used outside the plugin and there is no guarantee of backwards compatibility.
  *
- * @since 1.1.0
+ * @since x.x.x
  */
 class Settings {
 
 	/**
 	 * The ability category used for settings abilities.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 * @var string
 	 */
 	public const CATEGORY = 'site';
 
+	/**
+	 * Settings exposed through the Abilities API, computed once at registration.
+	 *
+	 * Plugin: cached so the input/output schema and the executed result derive from the exact
+	 * same structure, and {@see get_registered_settings()} is only walked once per request.
+	 *
+	 * @since x.x.x
+	 * @var array<string, array{option: string, group: string, default: mixed, schema: array<string, mixed>}>|null
+	 */
+	private static $exposed_settings = null;
+
 	/**
 	 * Hooks the ability into the Abilities API.
 	 *
 	 * Plugin: this method has no equivalent in the core class. In core, register() is
 	 * invoked directly from wp_register_core_abilities() (already on the
 	 * `wp_abilities_api_init` hook). The plugin instead hooks register() slightly later
-	 * (priority 11) so it can override any core-provided copy, and registers the category
-	 * as a fallback in case core has not.
+	 * (priority 11) so it can override any core-provided copy.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 */
 	public static function init(): void {
-		add_action( 'wp_abilities_api_categories_init', array( self::class, 'register_category' ), 11 );
 		add_action( 'wp_abilities_api_init', array( self::class, 'register' ), 11 );
 	}
 
-	/**
-	 * Registers the `site` ability category if it is not already registered.
-	 *
-	 * Plugin: this method has no equivalent in the core class; core relies on
-	 * wp_register_core_ability_categories() to register the `site` category.
-	 *
-	 * @since 1.1.0
-	 */
-	public static function register_category(): void {
-		if ( wp_has_ability_category( self::CATEGORY ) ) {
-			return;
-		}
-
-		wp_register_ability_category(
-			self::CATEGORY,
-			array(
-				'label'       => esc_html__( 'Site', 'ai' ),
-				'description' => esc_html__( 'Abilities that retrieve or modify site information and settings.', 'ai' ),
-			)
-		);
-	}
-
 	/**
 	 * Registers all settings abilities.
 	 *
 	 * Must run on the `wp_abilities_api_init` hook.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 */
 	public static function register(): void {
 		self::register_get_settings();
@@ -100,32 +86,39 @@ public static function register(): void {
 	/**
 	 * Registers the read-only `core/settings` ability.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 */
 	public static function register_get_settings(): void {
 		// Plugin: unregister any core-provided copy first so the plugin's version wins.
 		if ( wp_has_ability( 'core/settings' ) ) {
 			wp_unregister_ability( 'core/settings' );
 		}
 
-		$settings      = self::get_exposed_settings();
-		$groups        = array_values( array_unique( array_filter( wp_list_pluck( $settings, 'group' ) ) ) );
-		$setting_names = array_keys( $settings );
-		$properties    = array();
+		// Compute once; execute_get_settings() reuses this exact structure.
+		self::$exposed_settings = self::get_exposed_settings();
+
+		$settings    = self::$exposed_settings;
+		$field_names = array_keys( $settings );
+		$groups      = array();
+		$properties  = array();
 		foreach ( $settings as $exposed_name => $setting ) {
 			$properties[ $exposed_name ] = $setting['schema'];
+			if ( '' === $setting['group'] || in_array( $setting['group'], $groups, true ) ) {
+				continue;
+			}
+			$groups[] = $setting['group'];
 		}
 
 		wp_register_ability(
 			'core/settings',
 			array(
-				'label'               => esc_html__( 'Get Settings', 'ai' ),
-				'description'         => esc_html__( 'Returns WordPress settings as a flat map of setting name to value. By default returns all settings exposed to abilities, or optionally a subset filtered by settings group or by setting name.', 'ai' ),
+				'label'               => __( 'Get Settings', 'ai' ),
+				'description'         => __( 'Returns WordPress settings as a flat map of setting name to value. By default returns all settings exposed to abilities, or optionally a subset filtered by settings group, by setting name, or both.', 'ai' ),
 				'category'            => self::CATEGORY,
-				'input_schema'        => self::get_settings_input_schema( $groups, $setting_names ),
+				'input_schema'        => self::get_settings_input_schema( $groups, $field_names ),
 				'output_schema'       => array(
 					'type'                 => 'object',
-					'description'          => esc_html__( 'A map of setting name to its current value.', 'ai' ),
+					'description'          => __( 'A map of setting name to its current value.', 'ai' ),
 					'properties'           => $properties,
 					'additionalProperties' => false,
 				),
@@ -146,28 +139,28 @@ public static function register_get_settings(): void {
 	/**
 	 * Executes the `core/settings` ability.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @param mixed $input Optional. The ability input. Default empty array.
 	 * @return array<string, mixed> Map of exposed setting name to current value.
 	 */
 	public static function execute_get_settings( $input = array() ): array {
 		$input = is_array( $input ) ? $input : array();
 
-		$settings = self::get_exposed_settings();
-		$group    = isset( $input['group'] ) ? (string) $input['group'] : '';
-		$names    = isset( $input['settings'] ) && is_array( $input['settings'] ) ? $input['settings'] : array();
+		$settings = self::$exposed_settings ?? self::get_exposed_settings();
+		$group    = isset( $input['group'] ) && is_string( $input['group'] ) ? $input['group'] : '';
+		$fields   = isset( $input['fields'] ) && is_array( $input['fields'] ) ? $input['fields'] : array();
 
 		$result = array();
 		foreach ( $settings as $exposed_name => $setting ) {
 			if ( '' !== $group && $setting['group'] !== $group ) {
 				continue;
 			}
-			if ( ! empty( $names ) && ! in_array( $exposed_name, $names, true ) ) {
+			if ( ! empty( $fields ) && ! in_array( $exposed_name, $fields, true ) ) {
 				continue;
 			}
 
-			$type  = isset( $setting['schema']['type'] ) ? (string) $setting['schema']['type'] : 'string';
+			$type  = isset( $setting['schema']['type'] ) && is_string( $setting['schema']['type'] ) ? $setting['schema']['type'] : 'string';
 			$value = get_option( $setting['option'], $setting['default'] );
 
 			$result[ $exposed_name ] = self::cast_value( $value, $type );
@@ -179,7 +172,7 @@ public static function execute_get_settings( $input = array() ): array {
 	/**
 	 * Checks whether the current user may use the settings abilities.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @return bool True if the current user can manage options.
 	 */
@@ -188,55 +181,38 @@ public static function has_permission(): bool {
 	}
 
 	/**
-	 * Builds the input schema for the get ability: filter by group XOR by name.
+	 * Builds the input schema for the get ability: optional filters by group and/or name.
 	 *
-	 * @since 1.1.0
+	 * Both `group` and `fields` are optional; supplying both narrows the response to their
+	 * intersection, and supplying neither returns every exposed setting.
 	 *
-	 * @param string[] $groups        Available settings groups.
-	 * @param string[] $setting_names Available exposed setting names.
+	 * @since x.x.x
+	 *
+	 * @param string[] $groups      Available settings groups.
+	 * @param string[] $field_names Available exposed setting names.
 	 * @return array<string, mixed> The input JSON Schema.
 	 */
-	protected static function get_settings_input_schema( array $groups, array $setting_names ): array {
+	protected static function get_settings_input_schema( array $groups, array $field_names ): array {
 		return array(
-			'type'    => 'object',
-			'default' => array(),
-			// Filter by group OR by name, but not both at once.
-			'oneOf'   => array(
-				array(
-					'title'                => esc_html__( 'All settings', 'ai' ),
-					'type'                 => 'object',
-					'additionalProperties' => false,
+			'type'                 => 'object',
+			// Object (not array()) so the serialized schema default is {}, consistent with type:object.
+			'default'              => (object) array(),
+			'properties'           => array(
+				'group'  => array(
+					'type'        => 'string',
+					'enum'        => $groups,
+					'description' => __( 'Return only settings that belong to this settings group.', 'ai' ),
 				),
-				array(
-					'title'                => esc_html__( 'Filter by group', 'ai' ),
-					'type'                 => 'object',
-					'required'             => array( 'group' ),
-					'properties'           => array(
-						'group' => array(
-							'type'        => 'string',
-							'enum'        => $groups,
-							'description' => esc_html__( 'Return only settings that belong to this settings group.', 'ai' ),
-						),
+				'fields' => array(
+					'type'        => 'array',
+					'items'       => array(
+						'type' => 'string',
+						'enum' => $field_names,
 					),
-					'additionalProperties' => false,
-				),
-				array(
-					'title'                => esc_html__( 'Filter by name', 'ai' ),
-					'type'                 => 'object',
-					'required'             => array( 'settings' ),
-					'properties'           => array(
-						'settings' => array(
-							'type'        => 'array',
-							'items'       => array(
-								'type' => 'string',
-								'enum' => $setting_names,
-							),
-							'description' => esc_html__( 'Return only the settings with these names.', 'ai' ),
-						),
-					),
-					'additionalProperties' => false,
+					'description' => __( 'Return only the settings with these names.', 'ai' ),
 				),
 			),
+			'additionalProperties' => false,
 		);
 	}
 
@@ -248,7 +224,7 @@ protected static function get_settings_input_schema( array $groups, array $setti
 	 * underlying option name, the settings group, the registration default, and a JSON Schema
 	 * describing the value.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @return array<string, array{option: string, group: string, default: mixed, schema: array<string, mixed>}> Settings keyed by exposed name.
 	 */
@@ -262,11 +238,11 @@ protected static function get_exposed_settings(): array {
 			}
 
 			$option_name  = (string) $option_name;
-			$exposed_name = is_array( $show ) && ! empty( $show['name'] ) ? (string) $show['name'] : $option_name;
+			$exposed_name = is_array( $show ) && isset( $show['name'] ) && is_string( $show['name'] ) && '' !== $show['name'] ? $show['name'] : $option_name;
 
 			$settings[ $exposed_name ] = array(
 				'option'  => $option_name,
-				'group'   => isset( $args['group'] ) ? (string) $args['group'] : '',
+				'group'   => isset( $args['group'] ) && is_string( $args['group'] ) ? $args['group'] : '',
 				'default' => array_key_exists( 'default', $args ) ? $args['default'] : false,
 				'schema'  => self::value_schema( $args, $show ),
 			);
@@ -278,15 +254,15 @@ protected static function get_exposed_settings(): array {
 	/**
 	 * Builds the JSON Schema describing a single setting's value.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @param array<string, mixed>      $args The setting registration arguments.
 	 * @param bool|array<string, mixed> $show The setting's `show_in_abilities` value.
 	 * @return array<string, mixed> The value JSON Schema.
 	 */
 	protected static function value_schema( array $args, $show ): array {
 		$schema = array(
-			'type' => isset( $args['type'] ) ? (string) $args['type'] : 'string',
+			'type' => isset( $args['type'] ) && is_string( $args['type'] ) ? $args['type'] : 'string',
 		);
 		if ( ! empty( $args['label'] ) ) {
 			$schema['title'] = $args['label'];
@@ -295,7 +271,9 @@ protected static function value_schema( array $args, $show ): array {
 			$schema['description'] = $args['description'];
 		}
 		if ( is_array( $show ) && isset( $show['schema'] ) && is_array( $show['schema'] ) ) {
-			$schema = array_merge( $schema, $show['schema'] );
+			/** @var array<string, mixed> $show_schema */
+			$show_schema = $show['schema'];
+			$schema      = array_merge( $schema, $show_schema );
 		}
 
 		return $schema;
@@ -304,7 +282,7 @@ protected static function value_schema( array $args, $show ): array {
 	/**
 	 * Casts a stored option value to the type declared in its settings registration.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @param mixed  $value The raw option value.
 	 * @param string $type  The registered setting type.
@@ -315,12 +293,15 @@ protected static function cast_value( $value, string $type ) {
 			case 'boolean':
 				return (bool) $value;
 			case 'integer':
-				return (int) $value;
+				return is_scalar( $value ) ? (int) $value : 0;
 			case 'number':
-				return (float) $value;
+				return is_scalar( $value ) ? (float) $value : 0.0;
 			case 'array':
-			case 'object':
 				return is_array( $value ) ? $value : array();
+			case 'object':
+				// Cast to object so an empty/non-array value serializes as {} (not []) and
+				// satisfies the `object` output schema validated by execute().
+				return (object) ( is_array( $value ) ? $value : array() );
 			default:
 				return is_scalar( $value ) ? (string) $value : $value;
 		}

includes/Abilities/Show_In_Abilities.php

@@ -4,7 +4,7 @@
  *
  * @package WordPress\AI
  *
- * @since 1.1.0
+ * @since x.x.x
  */
 
 declare( strict_types=1 );
@@ -27,14 +27,14 @@
  *
  * @internal This class should not be used outside the plugin and there is no guarantee of backwards compatibility.
  *
- * @since 1.1.0
+ * @since x.x.x
  */
 class Show_In_Abilities {
 
 	/**
 	 * Registers the hooks that mark core objects as exposed to abilities.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 */
 	public static function register(): void {
 		add_filter( 'register_setting_args', array( self::class, 'mark_setting' ), 10, 4 );
@@ -46,7 +46,7 @@ public static function register(): void {
 	 * Respects an explicit `show_in_abilities` value already present on the setting (for
 	 * example once core ships it natively), only filling it in when absent.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @param array<string, mixed> $args         The setting registration arguments.
 	 * @param array<string, mixed> $defaults     The default registration arguments.
@@ -71,7 +71,7 @@ public static function mark_setting( array $args, array $defaults, string $optio
 	 * optional `name` and `schema` keys (mirroring the `show_in_rest` shape). This matches
 	 * the set marked natively by the core `core/settings` implementation.
 	 *
-	 * @since 1.1.0
+	 * @since x.x.x
 	 *
 	 * @return array<string, bool|array<string, mixed>> Settings map keyed by option name.
 	 */