Tweaks after backport to CSL

Author: acuthbert

src/Adapters/BaseEntityAdapter.php

@@ -23,11 +23,12 @@ abstract protected function storeEntity($entity);
     abstract protected function getEntityList(
         int $offset,
         int $pageSize,
-        string $sort = null,
-        Request $request
+        ?string $sort = null,
+        Request $request = null,
+        $arguments = []
     ): SearchResponseEntity;
 
-    final public function list(Request $request, Response $response): Response
+    final public function list(Request $request, Response $response, $arguments = []): Response
     {
         $offset = (int)$request->getQueryParam('offset', $request->getQueryParam('from', 1) - 1);
         if ($offset < 0) {
@@ -40,7 +41,8 @@ final public function list(Request $request, Response $response): Response
             $offset,
             $pageSize,
             $sort,
-            $request
+            $request,
+            $arguments
         );
         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): Response
+    final public function list(Request $request, Response $response, $arguments = []): Response
     {
         return $this->entityAdapter->list(...func_get_args());
     }

src/Adapters/EntityAdapter.php

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

src/Adapters/EntityAdapterInterface.php

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

src/Adapters/Stem/LegacyStemEntityAdapter.php

@@ -92,8 +92,9 @@ protected function getListFilterForRequest(Request $request): array
     final protected function getEntityList(
         int $offset,
         int $pageSize,
-        string $sort = null,
-        Request $request
+        ?string $sort = null,
+        Request $request = null,
+        $arguments = []
     ): SearchResponseEntity {
         $criteria = new SearchCriteriaEntity($offset, $pageSize, $sort);
         $response = new SearchResponseEntity($criteria);