jdormit/activitypub-php
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle unicode in response properly

Browse Source
This commit is contained in:
Jeremy Dormitzer 2019-03-30 11:26:39 -04:00
parent 6729d98039
commit 5f985c36c0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controllers/GetController.php
View File

@ -105,15 +105,21 @@ class GetController
}; };
} }
$pagedCollection = $this->collectionsService->pageAndFilterCollection( $request, $object, $filterFunc ); $pagedCollection = $this->collectionsService->pageAndFilterCollection( $request, $object, $filterFunc );
return $this->makeJsonResponse( $pagedCollection );
return new JsonResponse( $pagedCollection );
} }
$response = new JsonResponse( $object->asArray() ); $response = $this->makeJsonResponse( $object->asArray() );
if ( $object->hasField( 'type' ) && if ( $object->hasField( 'type' ) &&
$object['type'] === 'Tombstone' ) { $object['type'] === 'Tombstone' ) {
$response->setStatusCode( 410 ); $response->setStatusCode( 410 );
} }
return $response; return $response;
} }
private function makeJsonResponse( $obj )
{
$response = new Response( json_encode( $obj, JSON_UNESCAPED_UNICODE ) );
$response->headers->set( 'Content-Type', 'application/json' );
return $response;
}
} }