Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "handler: Throw on unsupported body"

Browse source
This commit is contained in:
jenkins-bot 2024-02-29 12:39:30 +00:00 committed by Gerrit Code Review
commit df80780e51
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Rest/Handler.php
View file

@ -539,7 +539,10 @@ abstract class Handler {
}
return $parsedBody;
default:
return null;
throw new LocalizedHttpException(
new MessageValue( 'rest-unsupported-content-type', [ $contentType ?? '(null)' ] ),
415
);
}
}

12
tests/phpunit/unit/includes/Rest/Handler/HandlerTest.php
View file

@ -472,7 +472,10 @@ class HandlerTest extends MediaWikiUnitTestCase {
return [
'null body type' => [
new RequestData(),
null
new LocalizedHttpException(
new MessageValue( 'rest-unsupported-content-type', [ '' ] ),
415
)
],
'json body' => [
new RequestData( [
@ -485,7 +488,10 @@ class HandlerTest extends MediaWikiUnitTestCase {
new RequestData( [
'headers' => [ 'Content-Type' => 'unknown/type' ]
] ),
null
new LocalizedHttpException(
new MessageValue( 'rest-unsupported-content-type', [ '' ] ),
415
)
],
'invalid json body' => [
new RequestData( [
@ -505,6 +511,8 @@ class HandlerTest extends MediaWikiUnitTestCase {
$handler = $this->newHandler();
if ( $expectedResult instanceof LocalizedHttpException ) {
$this->expectException( LocalizedHttpException::class );
$this->expectExceptionCode( $expectedResult->getCode() );
$this->expectExceptionMessage( $expectedResult->getMessage() );
$handler->parseBodyData( $requestData );
} else {
$parsedBody = $handler->parseBodyData( $requestData );