Revert "Tweaks after backport to CSL"

This reverts commit 1e80d47.

Author: samnotsowise

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+### 3.0.4  
+Reverted:   Breaking changes which can be done more neatly with current request middleware
+
 ### 3.0.3
 Added:      Current Request middleware. Provides a singleton that can be used to get the current request, similar to rhubarb's `Request::current()` 
 

src/Adapters/BaseEntityAdapter.php

@@ -21,25 +21,23 @@ abstract protected function updateEntityWithPayload($entity, $payload);
     abstract protected function storeEntity($entity);
 
     abstract protected function getEntityList(
+        Request $request,
         int $offset,
         int $pageSize,
-        ?string $sort = null,
-        Request $request = null,
-        $arguments = []
+        ?string $sort = null
     ): SearchResponseEntity;
 
-    final public function list(Request $request, Response $response, $arguments = []): Response
+    final public function list(Request $request, Response $response): Response
     {
         $offset = (int)$request->getQueryParam('offset', $request->getQueryParam('from', 1) - 1);
         $pageSize = (int)$request->getQueryParam('pageSize', $request->getQueryParam('to', 10 - $offset));
         $sort = $request->getQueryParam('sort');
 
         $list = $this->getEntityList(
+            $request,
             $offset,
             $pageSize,
-            $sort,
-            $request,
-            $arguments
+            $sort
         );
         return $response
             ->withJson(array_map(

src/Adapters/DIEntityAdapter.php

@@ -16,7 +16,7 @@ public function __construct()
         $this->entityAdapter = Container::instance(static::class);
     }
 
-    final public function list(Request $request, Response $response, $arguments = []): Response
+    final public function list(Request $request, Response $response): Response
     {
         return $this->entityAdapter->list(...func_get_args());
     }

src/Adapters/EntityAdapter.php

@@ -16,23 +16,21 @@ protected function getSearchResponseEntity(SearchCriteriaEntity $criteria): Sear
     }
 
     protected function getSearchCriteriaEntity(
+        Request $request,
         int $offset,
         int $pageSize,
-        ?string $sort = null,
-        Request $request = null,
-        $arguments = []
+        string $sort = null
     ): SearchCriteriaEntity {
         return new SearchCriteriaEntity($offset, $pageSize, $sort);
     }
 
     final protected function getEntityList(
+        Request $request,
         int $offset,
         int $pageSize,
-        ?string $sort = null,
-        Request $request = null,
-        $arguments = []
+        ?string $sort = null
     ): SearchResponseEntity {
-        $response = new SearchResponseEntity($this->getSearchCriteriaEntity($offset, $pageSize, $sort, $request, $arguments));
+        $response = new SearchResponseEntity($this->getSearchCriteriaEntity($request, $offset, $pageSize, $sort));
         $this->performSearch($response);
         return $response;
     }

src/Adapters/EntityAdapterInterface.php

@@ -7,7 +7,7 @@
 
 interface EntityAdapterInterface
 {
-    public function list(Request $request, Response $response, $arguments = []): Response;
+    public function list(Request $request, Response $response): Response;
 
     public function get(Request $request, Response $response, $id): Response;
 

src/Adapters/Stem/LegacyStemEntityAdapter.php

@@ -84,17 +84,17 @@ protected function getListFilterForRequest(Request $request): array
     }
 
     /**
+     * @param Request $request
      * @param int $offset
      * @param int $pageSize
-     * @param Request $request
+     * @param string|null $sort
      * @return Collection
      */
     final protected function getEntityList(
+        Request $request,
         int $offset,
         int $pageSize,
-        ?string $sort = null,
-        Request $request = null,
-        $arguments = []
+        ?string $sort = null
     ): SearchResponseEntity {
         $criteria = new SearchCriteriaEntity($offset, $pageSize, $sort);
         $response = new SearchResponseEntity($criteria);