github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-12 06:03:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes to comply with PSR-2

Browse Source
This commit is contained in:
Franz Liedke 2015-05-27 02:37:27 +02:00
parent ee8e30910b
commit 69038857fa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Api/Actions/JsonApiAction.php
View File

@ -37,7 +37,9 @@ abstract class JsonApiAction implements ActionInterface
protected function json($data = null, $status = 200) protected function json($data = null, $status = 200)
{ {
if ($data === null) $data = new \ArrayObject(); if ($data === null) {
$data = new \ArrayObject();
}
$data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT); $data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);

2
framework/core/src/Api/ApiServiceProvider.php
View File

@ -17,7 +17,7 @@ class ApiServiceProvider extends ServiceProvider
'Flarum\Api\ExceptionHandler' 'Flarum\Api\ExceptionHandler'
); );
$this->app->singleton('Flarum\Http\Router', function() { return new Router(); }); $this->app->singleton('Flarum\Http\Router');
include __DIR__.'/routes.php'; include __DIR__.'/routes.php';
} }