Abilities API: make WP_Settings_Abilities instance-based.

Move register() and the ability callbacks (execute_get_settings(),
has_permission()) from public static to public methods, and the internal
helpers to private methods; the exposed-settings cache becomes an instance
property. wp_register_core_abilities() now registers the ability via
( new WP_Settings_Abilities() )->register(), reducing the static surface
of this @access private class.

Author: jorgefilipecosta

src/wp-includes/abilities.php

@@ -355,5 +355,5 @@ function wp_register_core_abilities(): void {
 	);
 
 	// Register the settings abilities (currently the read-only `core/settings`).
-	WP_Settings_Abilities::register();
+	( new WP_Settings_Abilities() )->register();
 }

src/wp-includes/abilities/class-wp-settings-abilities.php

@@ -43,7 +43,7 @@ final class WP_Settings_Abilities {
 	 * @since 7.1.0
 	 * @var array<string, array{option: string, group: string, default: mixed, schema: array<string, mixed>}>|null
 	 */
-	private static $exposed_settings = null;
+	private $exposed_settings = null;
 
 	/**
 	 * Registers all settings abilities.
@@ -52,14 +52,14 @@ final class WP_Settings_Abilities {
 	 *
 	 * @since 7.1.0
 	 */
-	public static function register(): void {
-		self::register_get_settings();
+	public function register(): void {
+		$this->register_get_settings();
 
 		/*
 		 * A future write-oriented ability can be registered here, reusing the shared
 		 * helpers below (get_exposed_settings(), value_schema(), cast_value()):
 		 *
-		 *     self::register_manage_settings();
+		 *     $this->register_manage_settings();
 		 */
 	}
 
@@ -68,11 +68,11 @@ public static function register(): void {
 	 *
 	 * @since 7.1.0
 	 */
-	private static function register_get_settings(): void {
+	private function register_get_settings(): void {
 		// Compute once; execute_get_settings() reuses this exact structure.
-		self::$exposed_settings = self::get_exposed_settings();
+		$this->exposed_settings = $this->get_exposed_settings();
 
-		$settings    = self::$exposed_settings;
+		$settings    = $this->exposed_settings;
 		$field_names = array_keys( $settings );
 		$groups      = array();
 		$properties  = array();
@@ -90,15 +90,15 @@ private static function register_get_settings(): void {
 				'label'               => __( 'Get Settings' ),
 				'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.' ),
 				'category'            => self::CATEGORY,
-				'input_schema'        => self::get_settings_input_schema( $groups, $field_names ),
+				'input_schema'        => $this->get_settings_input_schema( $groups, $field_names ),
 				'output_schema'       => array(
 					'type'                 => 'object',
 					'description'          => __( 'A map of setting name to its current value.' ),
 					'properties'           => $properties,
 					'additionalProperties' => false,
 				),
-				'execute_callback'    => array( self::class, 'execute_get_settings' ),
-				'permission_callback' => array( self::class, 'has_permission' ),
+				'execute_callback'    => array( $this, 'execute_get_settings' ),
+				'permission_callback' => array( $this, 'has_permission' ),
 				'meta'                => array(
 					'annotations'  => array(
 						'readonly'    => true,
@@ -119,10 +119,10 @@ private static function register_get_settings(): void {
 	 * @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 {
+	public function execute_get_settings( $input = array() ): array {
 		$input = is_array( $input ) ? $input : array();
 
-		$settings = self::$exposed_settings;
+		$settings = $this->exposed_settings;
 		if ( null === $settings ) {
 			// The cache is populated in register_get_settings() before the ability is
 			// registered, so this is unreachable in practice; bail defensively otherwise.
@@ -144,7 +144,7 @@ public static function execute_get_settings( $input = array() ): array {
 			$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 );
+			$result[ $exposed_name ] = $this->cast_value( $value, $type );
 		}
 
 		return $result;
@@ -157,7 +157,7 @@ public static function execute_get_settings( $input = array() ): array {
 	 *
 	 * @return bool True if the current user can manage options.
 	 */
-	public static function has_permission(): bool {
+	public function has_permission(): bool {
 		return current_user_can( 'manage_options' );
 	}
 
@@ -173,7 +173,7 @@ public static function has_permission(): bool {
 	 * @param list<string> $field_names Available exposed setting names.
 	 * @return array<string, mixed> The input JSON Schema.
 	 */
-	private static function get_settings_input_schema( array $groups, array $field_names ): array {
+	private function get_settings_input_schema( array $groups, array $field_names ): array {
 		return array(
 			'type'                 => 'object',
 			// Object (not array()) so the serialized schema default is {}, consistent with type:object.
@@ -209,7 +209,7 @@ private static function get_settings_input_schema( array $groups, array $field_n
 	 *
 	 * @return array<string, array{option: string, group: string, default: mixed, schema: array<string, mixed>}> Settings keyed by exposed name.
 	 */
-	private static function get_exposed_settings(): array {
+	private function get_exposed_settings(): array {
 		$settings = array();
 
 		foreach ( get_registered_settings() as $option_name => $args ) {
@@ -225,7 +225,7 @@ private static function get_exposed_settings(): array {
 				'option'  => $option_name,
 				'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 ),
+				'schema'  => $this->value_schema( $args, $show ),
 			);
 		}
 
@@ -241,7 +241,7 @@ private static function get_exposed_settings(): array {
 	 * @param bool|array<string, mixed> $show The setting's `show_in_abilities` value.
 	 * @return array<string, mixed> The value JSON Schema.
 	 */
-	private static function value_schema( array $args, $show ): array {
+	private function value_schema( array $args, $show ): array {
 		$schema = array(
 			'type' => isset( $args['type'] ) && is_string( $args['type'] ) ? $args['type'] : 'string',
 		);
@@ -269,7 +269,7 @@ private static function value_schema( array $args, $show ): array {
 	 * @param string $type  The registered setting type.
 	 * @return mixed The value cast to the declared type.
 	 */
-	private static function cast_value( $value, string $type ) {
+	private function cast_value( $value, string $type ) {
 		switch ( $type ) {
 			case 'boolean':
 				return (bool) $value;