From 5e4ff01568c8bc6c0930cd052070947bffc1dd2c Mon Sep 17 00:00:00 2001 From: fogelito Date: Mon, 1 May 2023 12:18:50 +0300 Subject: [PATCH] getByType --- app/controllers/api/databases.php | 6 +++--- app/controllers/api/functions.php | 6 +++--- app/controllers/api/projects.php | 2 +- app/controllers/api/storage.php | 4 ++-- app/controllers/api/teams.php | 4 ++-- app/controllers/api/users.php | 2 +- app/init.php | 2 +- composer.lock | 20 ++++++++++---------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 21858555a6..4e3d5bde5f 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -468,7 +468,7 @@ App::get('/v1/databases') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -794,7 +794,7 @@ App::get('/v1/databases/:databaseId/collections') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -2882,7 +2882,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') $queries = Query::parseQueries($queries); // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { $documentId = $cursor->getValue(); diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 5c10a3df9b..89132bead3 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -136,7 +136,7 @@ App::get('/v1/functions') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -812,7 +812,7 @@ App::get('/v1/functions/:functionId/deployments') $queries[] = Query::equal('resourceType', ['functions']); // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -1246,7 +1246,7 @@ App::get('/v1/functions/:functionId/executions') $queries[] = Query::equal('functionId', [$function->getId()]); // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 44329724b1..b1374097e5 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -197,7 +197,7 @@ App::get('/v1/projects') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index b936fc6b2f..c65b44184f 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -167,7 +167,7 @@ App::get('/v1/storage/buckets') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -707,7 +707,7 @@ App::get('/v1/storage/buckets/:bucketId/files') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 4f64a65752..daa44d02b9 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -148,7 +148,7 @@ App::get('/v1/teams') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ @@ -629,7 +629,7 @@ App::get('/v1/teams/:teamId/memberships') $queries[] = Query::equal('teamId', [$teamId]); // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 72a351d97c..cb2645785c 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -386,7 +386,7 @@ App::get('/v1/users') } // Get cursor document if there was a cursor query - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { /** @var Query $cursor */ diff --git a/app/init.php b/app/init.php index 02fd9246f7..b6dfc79fe1 100644 --- a/app/init.php +++ b/app/init.php @@ -1085,7 +1085,7 @@ App::setResource('schema', function ($utopia, $dbForProject) { $complexity = function (int $complexity, array $args) { $queries = Query::parseQueries($args['queries'] ?? []); - $query = Query::getByType($queries, Query::TYPE_LIMIT)[0] ?? null; + $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null; $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT; return $complexity * $limit; diff --git a/composer.lock b/composer.lock index 9247175eb6..4b8eb12ab9 100644 --- a/composer.lock +++ b/composer.lock @@ -2113,12 +2113,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "52f351230fab5922c6b63bd19b0bf4891d940d8f" + "reference": "0b7a496dbaec817909a41380728d43c9dc3ecfd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/52f351230fab5922c6b63bd19b0bf4891d940d8f", - "reference": "52f351230fab5922c6b63bd19b0bf4891d940d8f", + "url": "https://api.github.com/repos/utopia-php/database/zipball/0b7a496dbaec817909a41380728d43c9dc3ecfd4", + "reference": "0b7a496dbaec817909a41380728d43c9dc3ecfd4", "shasum": "" }, "require": { @@ -2163,7 +2163,7 @@ "issues": "https://github.com/utopia-php/database/issues", "source": "https://github.com/utopia-php/database/tree/appwrite-validators" }, - "time": "2023-04-27T15:49:03+00:00" + "time": "2023-05-01T08:52:04+00:00" }, { "name": "utopia-php/domains", @@ -3034,16 +3034,16 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "0.32.2", + "version": "0.32.3", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "cdec289bcf38c99d0074414d2438e9967d0c9699" + "reference": "4057e14a61335070034b1cbdce9e39bef94d997d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/cdec289bcf38c99d0074414d2438e9967d0c9699", - "reference": "cdec289bcf38c99d0074414d2438e9967d0c9699", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/4057e14a61335070034b1cbdce9e39bef94d997d", + "reference": "4057e14a61335070034b1cbdce9e39bef94d997d", "shasum": "" }, "require": { @@ -3079,9 +3079,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/0.32.2" + "source": "https://github.com/appwrite/sdk-generator/tree/0.32.3" }, - "time": "2023-04-12T21:06:57+00:00" + "time": "2023-04-27T19:22:05+00:00" }, { "name": "doctrine/deprecations",