Pass context to AdapterInterface::newQuery()

Author: tobyzerner

src/Adapter/AdapterInterface.php

@@ -11,6 +11,7 @@
 
 namespace Tobyz\JsonApiServer\Adapter;
 
+use Tobyz\JsonApiServer\Context;
 use Tobyz\JsonApiServer\Schema\Attribute;
 use Tobyz\JsonApiServer\Schema\HasMany;
 use Tobyz\JsonApiServer\Schema\HasOne;
@@ -27,7 +28,7 @@ interface AdapterInterface
      *
      * @return mixed
      */
-    public function newQuery();
+    public function newQuery(Context $context);
 
     /**
      * Manipulate the query to only include resources with the given IDs.

src/Adapter/EloquentAdapter.php

@@ -18,6 +18,7 @@
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphOneOrMany;
 use InvalidArgumentException;
+use Tobyz\JsonApiServer\Context;
 use Tobyz\JsonApiServer\Schema\Attribute;
 use Tobyz\JsonApiServer\Schema\HasMany;
 use Tobyz\JsonApiServer\Schema\HasOne;
@@ -49,7 +50,7 @@ public function newModel()
         return $this->model->newInstance();
     }
 
-    public function newQuery()
+    public function newQuery(Context $context)
     {
         return $this->model->query();
     }

src/Endpoint/Concerns/FindsResources.php

@@ -26,7 +26,7 @@ trait FindsResources
     private function findResource(ResourceType $resource, string $id, Context $context)
     {
         $adapter = $resource->getAdapter();
-        $query = $adapter->newQuery();
+        $query = $adapter->newQuery($context);
 
         run_callbacks($resource->getSchema()->getListeners('scope'), [$query, $context]);
 

src/Endpoint/Index.php

@@ -57,7 +57,7 @@ public function handle(Context $context): ResponseInterface
             throw new ForbiddenException;
         }
 
-        $query = $adapter->newQuery();
+        $query = $adapter->newQuery($context);
 
         run_callbacks($schema->getListeners('listing'), [$query, $context]);
         run_callbacks($schema->getListeners('scope'), [$query, $context]);