From 5debe2c13c0fb7fb069b0480fb68ce0028065c91 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 12 Oct 2022 20:20:44 +1300 Subject: [PATCH] Alias + name fixes --- app/controllers/api/graphql.php | 12 ++++++------ src/Appwrite/GraphQL/Promises/Adapter/Swoole.php | 9 +++++---- src/Appwrite/GraphQL/Resolvers.php | 14 +++++++------- src/Appwrite/GraphQL/Schema.php | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/controllers/api/graphql.php b/app/controllers/api/graphql.php index 47596fd5c..5c611c00b 100644 --- a/app/controllers/api/graphql.php +++ b/app/controllers/api/graphql.php @@ -91,8 +91,8 @@ App::post('/v1/graphql/upload') * @throws Exception */ function executeRequest( - Appwrite\Utopia\Request $request, - Appwrite\Utopia\Response $response, + Request $request, + Response $response, Adapter $promiseAdapter, Type\Schema $schema ): void { @@ -109,10 +109,10 @@ function executeRequest( $maxDepth = App::getEnv('_APP_GRAPHQL_MAX_DEPTH', 3); if (\str_starts_with($contentType, 'application/graphql')) { - $query = parseGraphqlRequest($request); + $query = parseGraphql($request); } if (\str_starts_with($contentType, 'multipart/form-data')) { - $query = parseMultipartRequest($query, $request); + $query = parseMultipart($query, $request); } if (!empty($query) && !isset($query[0])) { $query = [$query]; @@ -174,7 +174,7 @@ function executeRequest( * @param Request $request * @return array */ -function parseGraphqlRequest(Request $request): array +function parseGraphql(Request $request): array { return [ 'query' => $request->getSwoole()->rawContent() ]; } @@ -186,7 +186,7 @@ function parseGraphqlRequest(Request $request): array * @param Request $request * @return array */ -function parseMultipartRequest(array $query, Request $request): array +function parseMultipart(array $query, Request $request): array { $operations = \json_decode($query['operations'], true); $map = \json_decode($query['map'], true); diff --git a/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php b/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php index caab88afa..efe6eb2f5 100644 --- a/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php +++ b/src/Appwrite/GraphQL/Promises/Adapter/Swoole.php @@ -3,13 +3,14 @@ namespace Appwrite\GraphQL\Promises\Adapter; use Appwrite\GraphQL\Promises\Adapter; +use Appwrite\Promises\Swoole as SwoolePromise; use GraphQL\Executor\Promise\Promise as GQLPromise; class Swoole extends Adapter { public function create(callable $resolver): GQLPromise { - $promise = new Swoole(function ($resolve, $reject) use ($resolver) { + $promise = new SwoolePromise(function ($resolve, $reject) use ($resolver) { $resolver($resolve, $reject); }); @@ -18,7 +19,7 @@ class Swoole extends Adapter public function createFulfilled($value = null): GQLPromise { - $promise = new Swoole(function ($resolve, $reject) use ($value) { + $promise = new SwoolePromise(function ($resolve, $reject) use ($value) { $resolve($value); }); @@ -27,7 +28,7 @@ class Swoole extends Adapter public function createRejected($reason): GQLPromise { - $promise = new Swoole(function ($resolve, $reject) use ($reason) { + $promise = new SwoolePromise(function ($resolve, $reject) use ($reason) { $reject($reason); }); @@ -36,6 +37,6 @@ class Swoole extends Adapter public function all(array $promisesOrValues): GQLPromise { - return new GQLPromise(Swoole::all($promisesOrValues), $this); + return new GQLPromise(SwoolePromise::all($promisesOrValues), $this); } } diff --git a/src/Appwrite/GraphQL/Resolvers.php b/src/Appwrite/GraphQL/Resolvers.php index 49857c622..29de91cb8 100644 --- a/src/Appwrite/GraphQL/Resolvers.php +++ b/src/Appwrite/GraphQL/Resolvers.php @@ -26,7 +26,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $route, $args, $context, $info) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -98,7 +98,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $dbForProject, $databaseId, $collectionId, $type, $args) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -129,7 +129,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $dbForProject, $databaseId, $collectionId, $type, $args) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -168,7 +168,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $dbForProject, $databaseId, $collectionId, $type, $args) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -213,7 +213,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $dbForProject, $databaseId, $collectionId, $type, $args) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -258,7 +258,7 @@ class Resolvers ): callable { return static fn($type, $args, $context, $info) => new Swoole( function (callable $resolve, callable $reject) use ($utopia, $dbForProject, $databaseId, $collectionId, $type, $args) { - $utopia = $utopia->getResource('current', true); + $utopia = $utopia->getResource('utopia:graphql', true); $request = $utopia->getResource('request', true); $response = $utopia->getResource('response', true); $swoole = $request->getSwoole(); @@ -321,7 +321,7 @@ class Resolvers if ($beforeReject) { $payload = $beforeReject($payload); } - $reject(new Exception( + $reject(new GQLException( message: $payload['message'], code: $response->getStatusCode() )); diff --git a/src/Appwrite/GraphQL/Schema.php b/src/Appwrite/GraphQL/Schema.php index 1fcadec27..fcab39701 100644 --- a/src/Appwrite/GraphQL/Schema.php +++ b/src/Appwrite/GraphQL/Schema.php @@ -26,7 +26,7 @@ class Schema string $projectId, Database $dbForProject ): GQLSchema { - App::setResource('utopia:self', static function () use ($utopia) { + App::setResource('utopia:graphql', static function () use ($utopia) { return $utopia; });