Use array instead of variadic

2024-06-28 19:20:25 +12:00 · 2023-05-16 15:56:20 +03:00 · 2023-05-16 15:56:20 +03:00 · f6153b7626
parent d55dc7a5b2
commit f6153b7626
7 changed files with 26 additions and 29 deletions
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -1411,7 +1411,7 @@ App::get('/v1/account/logs')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('user')
    ->inject('locale')
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -46,7 +46,7 @@ use Appwrite\Event\Event;
 use Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
-use Utopia\Database\Validator\Queries\Documents as DocumentsQueriesValidator;
+use Utopia\Database\Validator\Queries\Documents;
 use Utopia\Database\Validator\Queries\Document as DocumentQueriesValidator;
 use Utopia\Config\Config;
 use MaxMind\Db\Reader;
@ -528,7 +528,7 @@ App::get('/v1/databases/:databaseId/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('databaseId', '', new UID(), 'Database ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
@ -867,7 +867,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('collectionId', '', new UID(), 'Collection ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
@ -2900,7 +2900,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
        }

        // Validate queries
-        $queriesValidator = new DocumentsQueriesValidator($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
+        $queriesValidator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
        $validQueries = $queriesValidator->isValid($queries);
        if (!$validQueries) {
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $queriesValidator->getDescription());
@ -3101,7 +3101,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('collectionId', '', new UID(), 'Collection ID.')
    ->param('documentId', '', new UID(), 'Document ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@ -1002,7 +1002,7 @@ App::get('/v1/teams/:teamId/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -557,7 +557,7 @@ App::get('/v1/users/:userId/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
--- a/composer.lock
+++ b/composer.lock
@ -481,16 +481,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "7.5.1",
+            "version": "7.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9"
+                "reference": "733dd89533dd371a0987172727df15f500dab0ef"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b964ca597e86b752cd994f27293e9fa6b6a95ed9",
-                "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/733dd89533dd371a0987172727df15f500dab0ef",
+                "reference": "733dd89533dd371a0987172727df15f500dab0ef",
                "shasum": ""
            },
            "require": {
@ -521,9 +521,6 @@
                "bamarni-bin": {
                    "bin-links": true,
                    "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "7.5-dev"
                }
            },
            "autoload": {
@ -589,7 +586,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.5.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.6.0"
            },
            "funding": [
                {
@ -605,7 +602,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-04-17T16:30:08+00:00"
+            "time": "2023-05-14T11:23:39+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@ -2113,12 +2110,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "d7795caccab8811ebe0e30d6f425d277ed522ad5"
+                "reference": "51ff5b031397ef27e789bd14855f13c233282c74"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/d7795caccab8811ebe0e30d6f425d277ed522ad5",
-                "reference": "d7795caccab8811ebe0e30d6f425d277ed522ad5",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/51ff5b031397ef27e789bd14855f13c233282c74",
+                "reference": "51ff5b031397ef27e789bd14855f13c233282c74",
                "shasum": ""
            },
            "require": {
@ -2163,7 +2160,7 @@
                "issues": "https://github.com/utopia-php/database/issues",
                "source": "https://github.com/utopia-php/database/tree/appwrite-validators"
            },
-            "time": "2023-05-04T13:23:51+00:00"
+            "time": "2023-05-15T13:12:11+00:00"
        },
        {
            "name": "utopia-php/domains",
@ -4548,16 +4545,16 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
                "shasum": ""
            },
            "require": {
@ -4602,7 +4599,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
            },
            "funding": [
                {
@ -4610,7 +4607,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-05-07T05:35:17+00:00"
        },
        {
            "name": "sebastian/environment",
--- a/docs/tutorials/add-route.md
+++ b/docs/tutorials/add-route.md
@ -157,7 +157,7 @@ As the name implies, `param()` is used to define a request parameter.

 ```php
 App::get('/v1/account/logs')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
 ```

 ### 6. inject
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@ -70,6 +70,6 @@ class Base extends Queries
            new Select($attributes),
        ];

-        parent::__construct(...$validators);
+        parent::__construct($validators);
    }
 }