Remove types from the mark_setting method as this is hooked to register_setting_args and there's a chance other plugins could hook here and return bad data, resulting in fatals

dkotter · dkotter · commit b20616f2ad6c · 2026-06-29T08:39:09.000-06:00
diff --git a/includes/Abilities/Show_In_Abilities.php b/includes/Abilities/Show_In_Abilities.php
@@ -53,13 +53,17 @@ public function register(): void {
 	 *
 	 * @since x.x.x
 	 *
-	 * @param array<string, mixed> $args         The setting registration arguments.
+	 * @param mixed                $args         The setting registration arguments.
 	 * @param array<string, mixed> $defaults     The default registration arguments.
 	 * @param string               $option_group The settings group.
 	 * @param string               $option_name  The option name.
-	 * @return array<string, mixed> The (possibly amended) registration arguments.
+	 * @return mixed The (possibly amended) registration arguments.
 	 */
-	public function mark_setting( array $args, array $defaults, string $option_group, string $option_name ): array {
+	public function mark_setting( $args, $defaults, $option_group, $option_name ) {
+		if ( ! is_array( $args ) ) {
+			return $args;
+		}
+
 		$settings = $this->settings_map();
 
 		if ( isset( $settings[ $option_name ] ) && empty( $args['show_in_abilities'] ) ) {
diff --git a/tests/Integration/Includes/Abilities/Show_In_AbilitiesTest.php b/tests/Integration/Includes/Abilities/Show_In_AbilitiesTest.php
@@ -119,6 +119,41 @@ public function test_does_not_mark_uncurated_setting(): void {
 		$this->assertTrue( empty( $settings['wpai_not_curated_option']['show_in_abilities'] ) );
 	}
 
+	/**
+	 * Non-array arguments are returned untouched rather than fataling.
+	 *
+	 * Core applies the `register_setting_args` filter before `wp_parse_args()` normalizes the
+	 * arguments, so a plugin that calls `register_setting()` with a non-array (e.g. WPBakery
+	 * Page Builder passing `null`) reaches the filter unchanged. The callback must hand it back
+	 * as-is for core to normalize, not blow up on a strict array type.
+	 *
+	 * @since x.x.x
+	 *
+	 * @dataProvider data_non_array_args
+	 *
+	 * @param mixed $args A non-array value passed through the filter.
+	 */
+	public function test_passes_through_non_array_args( $args ): void {
+		$filtered = $this->show_in_abilities->mark_setting( $args, array(), 'general', 'blogname' );
+
+		$this->assertSame( $args, $filtered );
+	}
+
+	/**
+	 * Non-array argument values for the pass-through test.
+	 *
+	 * @since x.x.x
+	 *
+	 * @return array<string, array{0: mixed}> Data sets keyed by description.
+	 */
+	public function data_non_array_args(): array {
+		return array(
+			'null'   => array( null ),
+			'string' => array( 'sanitize_me' ),
+			'false'  => array( false ),
+		);
+	}
+
 	/**
 	 * An explicit `show_in_abilities` value already on the setting is preserved.
 	 *
