From 912a8ad9e33b3d3395793cf9bea25382683de1c3 Mon Sep 17 00:00:00 2001 From: Robin Fuller Date: Wed, 3 Aug 2016 23:14:02 +0100 Subject: [PATCH] Update ListResource.php removes overriding 'get' method that breaks jsonapi collection spec --- .../Laravel5/JsonApi/Actions/ListResource.php | 65 +------------------ 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/src/NilPortugues/Laravel5/JsonApi/Actions/ListResource.php b/src/NilPortugues/Laravel5/JsonApi/Actions/ListResource.php index c74e156..d157041 100644 --- a/src/NilPortugues/Laravel5/JsonApi/Actions/ListResource.php +++ b/src/NilPortugues/Laravel5/JsonApi/Actions/ListResource.php @@ -36,68 +36,5 @@ public function getErrorResponse(\Exception $e) return parent::getErrorResponse($e); } - - - /** - * @param callable $totalAmountCallable - * @param callable $resultsCallable - * @param string $route - * @param string $className - * - * @return \Symfony\Component\HttpFoundation\Response - */ - public function get(callable $totalAmountCallable, callable $resultsCallable, $route, $className) - { - try { - QueryObject::assert( - $this->serializer, - $this->fields, - $this->included, - $this->sorting, - $this->errorBag, - $className - ); - $totalAmount = $totalAmountCallable(); - - if ($totalAmount > 0 && $this->page->size() > 0 && $this->page->number() > ceil($totalAmount / $this->page->size())) { - return $this->resourceNotFound( - new ErrorBag([new OufOfBoundsError($this->page->number(), $this->page->size())]) - ); - } - - $links = $this->pagePaginationLinks( - $route, - $this->page->number(), - $this->page->size(), - $totalAmount, - $this->fields, - $this->sorting, - $this->included, - $this->filters - ); - - - $results = $resultsCallable(); - - if ($results instanceof Collection) { - $results = json_encode(['data' => $results->toArray()]); - } - - - $paginatedResource = new PaginatedResource( - $results, - $this->page->number(), - $this->page->size(), - $totalAmount, - $links - ); - - $response = $this->response($paginatedResource); - } catch (Exception $e) { - $response = $this->getErrorResponse($e); - } - - return $response; - } - + }