Skip to content
This repository was archived by the owner on Sep 24, 2018. It is now read-only.

Include programmatically readable erros for validation #1175

Merged
rachelbaker merged 3 commits into from
May 4, 2015
Merged

Include programmatically readable erros for validation #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
467d573
Include programmatically readbidle erros for validation
joehoyle May 4, 2015
4b93e3a
Coding standards fix
joehoyle May 4, 2015
69cd481
Silly annoying code formatting :P
joehoyle May 4, 2015
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
6 changes: 3 additions & 3 deletions lib/infrastructure/class-wp-rest-request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ public function has_valid_params() {
}

if ( ! empty( $required ) ) {
return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400 ) );
return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) );
}

// check the validation callbacks for each registered arg.
Expand All @@ -683,7 +683,7 @@ public function has_valid_params() {
$valid_check = call_user_func( $arg['validate_callback'], $param, $this );

if ( false === $valid_check ) {
$invalid_params[] = $key;
$invalid_params[ $key ] = __( 'Invalid param.' );
}

if ( is_wp_error( $valid_check ) ) {
Expand All @@ -693,7 +693,7 @@ public function has_valid_params() {
}

if ( $invalid_params ) {
return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', $invalid_params ) ), array( 'status' => 400 ) );
return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', $invalid_params ) ), array( 'status' => 400, 'params' => $invalid_params ) );
}

return true;
Expand Down
53 changes: 53 additions & 0 deletions tests/test-rest-request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,30 @@ public function test_has_valid_params_required_flag() {
$this->assertEquals( 'rest_missing_callback_param', $valid->get_error_code() );
}

public function test_has_valid_params_required_flag_multiple() {

$this->request->set_attributes(array(
'args' => array(
'someinteger' => array(
'required' => true,
),
'someotherinteger' => array(
'required' => true,
),
),
));

$valid = $this->request->has_valid_params();

$this->assertWPError( $valid );
$this->assertEquals( 'rest_missing_callback_param', $valid->get_error_code() );

$data = $valid->get_error_data( 'rest_missing_callback_param' );

$this->assertTrue( in_array( 'someinteger', $data['params'] ) );
$this->assertTrue( in_array( 'someotherinteger', $data['params'] ) );
}

public function test_has_valid_params_validate_callback() {

$this->request->set_url_params(array(
Expand All @@ -340,4 +364,33 @@ public function test_has_valid_params_validate_callback() {
$this->assertWPError( $valid );
$this->assertEquals( 'rest_invalid_param', $valid->get_error_code() );
}

public function test_has_multiple_invalid_params_validate_callback() {

$this->request->set_url_params(array(
'someinteger' => '123',
'someotherinteger' => '123',
));

$this->request->set_attributes(array(
'args' => array(
'someinteger' => array(
'validate_callback' => '__return_false',
),
'someotherinteger' => array(
'validate_callback' => '__return_false',
),
),
));

$valid = $this->request->has_valid_params();

$this->assertWPError( $valid );
$this->assertEquals( 'rest_invalid_param', $valid->get_error_code() );

$data = $valid->get_error_data( 'rest_invalid_param' );

$this->assertArrayHasKey( 'someinteger', $data['params'] );
$this->assertArrayHasKey( 'someotherinteger', $data['params'] );
}
}