Skip to content

Abilities Explorer: accept input properties that list several types #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkotter merged 1 commit into from
Oct 5, 2026
Merged

Abilities Explorer: accept input properties that list several types #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions includes/Experiments/Abilities_Explorer/Ability_Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,23 @@ private static function validate_property( string $prop_name, $value, array $pro
$errors = array();

if ( isset( $prop_schema['type'] ) ) {
$valid = self::validate_type( $value, $prop_schema['type'] );
// A type may also be a list of types, e.g. `array( 'string', 'object' )`, any of which can match.
$types = array_filter( (array) $prop_schema['type'], 'is_string' );
$valid = false;

foreach ( $types as $type ) {
if ( self::validate_type( $value, $type ) ) {
$valid = true;
break;
}
}

if ( ! $valid ) {
return array(
sprintf(
'Field "%s" should be of type "%s"',
$prop_name,
$prop_schema['type']
implode( '" or "', $types )
),
);
}
Expand Down
25 changes: 25 additions & 0 deletions tests/Integration/Includes/Experiments/Abilities_Explorer/Ability_HandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,31 @@ public function test_validate_input_validates_integer_type() {
$this->assertFalse( $result['valid'] );
}

/**
* Test validate_input validates a list of types.
*
* JSON Schema allows a property to list several types, and a value matching any of them is valid.
*
* @since x.x.x
*/
public function test_validate_input_validates_type_list() {
$schema = array(
'properties' => array(
'title' => array( 'type' => array( 'string', 'object' ) ),
),
);

$result = Ability_Handler::validate_input( $schema, array( 'title' => 'Hello' ) );
$this->assertTrue( $result['valid'] );

$result = Ability_Handler::validate_input( $schema, array( 'title' => array( 'raw' => 'Hello' ) ) );
$this->assertTrue( $result['valid'] );

$result = Ability_Handler::validate_input( $schema, array( 'title' => 42 ) );
$this->assertFalse( $result['valid'] );
$this->assertSame( 'Field "title" should be of type "string" or "object"', $result['errors'][0] );
}

/**
* Test validate_input validates numeric minimum and maximum constraints.
*
Expand Down
Loading