Reverting collection filtering

examples/User/JsonApi/Document/UsersDocument.php

@@ -67,13 +67,4 @@ public function getLinks()
             ->setPagination("http://example.com/api/users", $this->domainObject)
         ;
     }
-
-    /**
-     * @param \WoohooLabs\Yin\JsonApi\Request\RequestInterface $request
-     */
-    protected function filterContent(RequestInterface $request)
-    {
-        $this->filterCollection($request);
-        $this->sortCollection($request, "id");
-    }
 }

src/JsonApi/Request/Request.php

@@ -16,39 +16,39 @@ class Request implements RequestInterface
     /**
      * @var \Psr\Http\Message\ServerRequestInterface
      */
-    private $serverRequest;
+    protected $serverRequest;
 
     /**
      * @var array|null
      */
-    private $includedFields;
+    protected $includedFields;
 
     /**
      * @var array|null
      */
-    private $includedRelationships;
+    protected $includedRelationships;
 
     /**
      * @var array|null
      */
-    private $sorting;
+    protected $sorting;
 
     /**
      * @var array|null
      */
-    private $pagination;
+    protected $pagination;
 
     /**
      * @var array|null
      */
-    private $filtering;
+    protected $filtering;
 
     /**
      * @param \Psr\Http\Message\ServerRequestInterface $request
      */
     public function __construct(ServerRequestInterface $request)
     {
-        $this->serverRequest = $request->withParsedBody(json_decode($request->getBody(), true));
+        $this->serverRequest = $request;
     }
 
     /**
@@ -754,6 +754,12 @@ public function withUploadedFiles(array $uploadedFiles)
      */
     public function getParsedBody()
     {
+        if ($this->serverRequest->getBody()->getSize() && $this->serverRequest->getParsedBody() === null) {
+            $this->serverRequest = $this->serverRequest->withParsedBody(
+                json_decode($this->serverRequest->getBody(), true)
+            );
+        }
+
         return $this->serverRequest->getParsedBody();
     }
 

src/JsonApi/Transformer/AbstractCollectionDocument.php

@@ -5,8 +5,6 @@
 
 abstract class AbstractCollectionDocument extends AbstractCompoundDocument
 {
-    use CollectionFilterTrait;
-
     /**
      * @var \Traversable|array
      */
@@ -25,31 +23,6 @@ public function __construct(AbstractResourceTransformer $transformer)
         $this->transformer = $transformer;
     }
 
-    /**
-     * @param \WoohooLabs\Yin\JsonApi\Request\RequestInterface $request
-     */
-    abstract protected function filterContent(RequestInterface $request);
-
-    /**
-     * @param \WoohooLabs\Yin\JsonApi\Request\RequestInterface $request
-     * @param string $defaultSorting
-     */
-    protected function sortCollection(RequestInterface $request, $defaultSorting = "")
-    {
-        if (empty($request->getQueryParam("sort"))) {
-            $request = $request->withQueryParam("sort", $defaultSorting);
-        }
-        $this->sortByFields($this->data, $this->included, $request->getSortingByFields());
-    }
-
-    /**
-     * @param \WoohooLabs\Yin\JsonApi\Request\RequestInterface $request
-     */
-    protected function filterCollection(RequestInterface $request)
-    {
-        $this->filterByFields($this->data, $this->included, $request->getFilteringByFields());
-    }
-
     /**
      * Sets the value of the "data" and "included" properties based on the "resource" property.
      *
@@ -62,8 +35,6 @@ protected function setContent(RequestInterface $request)
         foreach ($this->domainObject as $item) {
             $this->data[] = $this->transformer->transformToResource($item, $request, $this->included);
         }
-
-        $this->filterContent($request);
     }
 
     /**