From ccbebce93b38fa22170020f845f59442ac1d230e Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 1 Jul 2015 20:58:14 +0200
Subject: [PATCH] Get rid of JsonApiResponse class
With the JSON-API library being updated, we can just make use of
Diactoros' JSON response class.
---
src/Api/Actions/SerializeAction.php | 6 ++----
src/Api/JsonApiResponse.php | 14 --------------
2 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 src/Api/JsonApiResponse.php
diff --git a/src/Api/Actions/SerializeAction.php b/src/Api/Actions/SerializeAction.php
index 86efc37d7..93bcb59a7 100644
--- a/src/Api/Actions/SerializeAction.php
+++ b/src/Api/Actions/SerializeAction.php
@@ -3,10 +3,10 @@
use Flarum\Api\Events\WillSerializeData;
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 Zend\Diactoros\Response\JsonResponse;
abstract class SerializeAction extends JsonApiAction
{
@@ -78,9 +78,7 @@ abstract class SerializeAction extends JsonApiAction
$serializer = new static::$serializer($request->actor, $request->include, $request->link);
$document->setData($this->serialize($serializer, $data));
- $response = new JsonApiResponse($document);
-
- return $response;
+ return new JsonResponse($document, 200, ['content-type' => 'application/vnd.api+json']);
}
/**
diff --git a/src/Api/JsonApiResponse.php b/src/Api/JsonApiResponse.php
deleted file mode 100644
index 2f7b74f21..000000000
--- a/src/Api/JsonApiResponse.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php namespace Flarum\Api;
-
-use Tobscure\JsonApi\Document;
-use Zend\Diactoros\Response;
-
-class JsonApiResponse extends Response
-{
- public function __construct(Document $document)
- {
- parent::__construct('php://memory', 200, ['content-type' => 'application/vnd.api+json']);
-
- $this->getBody()->write($document);
- }
-}