mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent ffb28838b5 d1e7453ffd
commit 1cbc60ca41
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Actions/SerializeAction.php
View File

@@ -1,11 +1,12 @@
<?php namespace Flarum\Api\Actions;
use Flarum\Api\Events\WillRespond;
use Flarum\Api\Request;
use Flarum\Api\JsonApiRequest;
use Flarum\Api\JsonApiResponse;
use Tobscure\JsonApi\Criteria;
use Tobscure\JsonApi\Document;
use Tobscure\JsonApi\SerializerInterface;
use Tobscure\JsonApi\Criteria;
abstract class SerializeAction extends JsonApiAction
{
@@ -68,15 +69,18 @@ abstract class SerializeAction extends JsonApiAction
public function respond(Request $request)
{
$request = static::buildJsonApiRequest($request);
$document = new Document();
$data = $this->data($request, $document);
$serializer = new static::$serializer($request->actor, $request->include, $request->link);
$document->setData($this->serialize($serializer, $data));
$response = new JsonApiResponse($document);
return new JsonApiResponse($document);
event(new WillRespond($this, $data, $request, $response));
return $response;
}
/**