bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Add response for JSON only

Browse source
This commit is contained in:
Philipp Holzer 2021-12-06 00:06:56 +01:00
parent d925e25424
commit fb1e8e75f5
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Module/Api/ApiResponse.php
View file

@ -221,6 +221,16 @@ class ApiResponse extends Response
$this->addContent($return); $this->addContent($return);
} }
/**
* Wrapper around exit() for JSON only responses
*
* @param array $data
*/
public function exitWithJson(array $data)
{
$this->exit('content', ['content' => $data], static::TYPE_JSON);
}
/** /**
* Quit execution with the message that the endpoint isn't implemented * Quit execution with the message that the endpoint isn't implemented
* *

2
src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
View file

@ -52,6 +52,6 @@ class VerifyCredentials extends BaseApi
// @todo Support the source property, // @todo Support the source property,
$account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid); $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
$this->response->exit('account', ['account' => $account->toArray()]); $this->response->exitWithJson($account->toArray());
} }
} }

4
tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php
View file

@ -14,7 +14,7 @@ class StatusesTest extends ApiTest
*/ */
public function testApiStatusShowWithJson() public function testApiStatusShowWithJson()
{ {
self::markTestIncomplete('Needs Stastuses to not set header during call (like at BaseApi::setLinkHeader'); self::markTestIncomplete('Needs Statuses to not set header during call (like at BaseApi::setLinkHeader');
// $result = api_status_show('json', 1); // $result = api_status_show('json', 1);
// self::assertStatus($result['status']); // self::assertStatus($result['status']);
@ -25,7 +25,7 @@ class StatusesTest extends ApiTest
*/ */
public function testApiStatusShowWithXml() public function testApiStatusShowWithXml()
{ {
self::markTestIncomplete('Needs Stastuses to not set header during call (like at BaseApi::setLinkHeader'); self::markTestIncomplete('Needs Statuses to not set header during call (like at BaseApi::setLinkHeader');
// $result = api_status_show('xml', 1); // $result = api_status_show('xml', 1);
// self::assertXml($result, 'statuses'); // self::assertXml($result, 'statuses');