From 7fc3b955413be648c6d1b8d149d3a0131f597945 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Wed, 21 Apr 2021 13:13:37 +0300 Subject: [PATCH 01/11] Updated SDK version --- app/config/platforms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/platforms.php b/app/config/platforms.php index c6718e602..139680b41 100644 --- a/app/config/platforms.php +++ b/app/config/platforms.php @@ -331,7 +331,7 @@ return [ [ 'key' => 'cli', 'name' => 'Command Line', - 'version' => '0.7.0', + 'version' => '0.8.0', 'url' => 'https://github.com/appwrite/sdk-for-cli', 'package' => 'https://github.com/appwrite/sdk-for-cli', 'enabled' => true, From 252249e56c67208c32c937f6e29103c5d0c47e3a Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Fri, 30 Apr 2021 07:58:00 +0300 Subject: [PATCH 02/11] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 16d8b6ce9..879da0e55 100644 --- a/README.md +++ b/README.md @@ -123,12 +123,11 @@ Below is a list of currently supported platforms and languages. If you wish to h #### Server * ✅   [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team) * ✅   [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team) +* ✅   [Dart](https://github.com/appwrite/sdk-for-dart) **Beta** (Maintained by the Appwrite Team) * ✅   [Deno](https://github.com/appwrite/sdk-for-deno) - **Beta** (Maintained by the Appwrite Team) * ✅   [Ruby](https://github.com/appwrite/sdk-for-ruby) - **Beta** (Maintained by the Appwrite Team) * ✅   [Python](https://github.com/appwrite/sdk-for-python) - **Beta** (Maintained by the Appwrite Team) * ✅   [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Experimental** (Maintained by the Appwrite Team) -* ✅   [Dart](https://github.com/appwrite/sdk-for-dart) **Experimental** (Maintained by the Appwrite Team) -* ✅   [Go](https://github.com/appwrite/sdk-for-go) **Work in progress** (Maintained by the Appwrite Team) Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)! From 34dfa8785a20fa5541e8dc0d0b62247066d2414f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 17:46:06 +0000 Subject: [PATCH 03/11] Bump phpmailer/phpmailer from 6.3.0 to 6.4.1 Bumps [phpmailer/phpmailer](https://github.com/PHPMailer/PHPMailer) from 6.3.0 to 6.4.1. - [Release notes](https://github.com/PHPMailer/PHPMailer/releases) - [Changelog](https://github.com/PHPMailer/PHPMailer/blob/master/changelog.md) - [Commits](https://github.com/PHPMailer/PHPMailer/compare/v6.3.0...v6.4.1) Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index e02c17d16..bdbb9543c 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "matomo/device-detector": "4.1.0", "dragonmantank/cron-expression": "3.1.0", "influxdb/influxdb-php": "1.15.2", - "phpmailer/phpmailer": "6.3.0", + "phpmailer/phpmailer": "6.4.1", "chillerlan/php-qrcode": "4.3.0", "adhocore/jwt": "1.1.2", "slickdeals/statsd": "~3.0" diff --git a/composer.lock b/composer.lock index 46a4fb4e5..723654a0d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a2e0fa49ac6df10ab340396b51546c3d", + "content-hash": "370390f068a8308603f857c40984de72", "packages": [ { "name": "adhocore/jwt", @@ -786,16 +786,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.3.0", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb" + "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb", - "reference": "4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9256f12d8fb0cd0500f93b19e18c356906cbed3d", + "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d", "shasum": "" }, "require": { @@ -813,7 +813,7 @@ "yoast/phpunit-polyfills": "^0.2.0" }, "suggest": { - "ext-mbstring": "Needed to send email in multibyte encoding charset", + "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", "league/oauth2-google": "Needed for Google XOAUTH2 authentication", "psr/log": "For optional PSR-3 debug logging", @@ -850,7 +850,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.3.0" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.4.1" }, "funding": [ { @@ -858,7 +858,7 @@ "type": "github" } ], - "time": "2021-02-19T15:28:08+00:00" + "time": "2021-04-29T12:25:04+00:00" }, { "name": "psr/http-client", From b3badfeb8d0a4daa8203d9ca540a1d11a55e2081 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 6 May 2021 17:45:32 +0200 Subject: [PATCH 04/11] feat(mock): add text response error --- app/controllers/mock.php | 21 +++++++++++++++++++++ src/Appwrite/Utopia/Response.php | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index 7e65e2d93..e92e0613b 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -359,6 +359,27 @@ App::get('/v1/mock/tests/general/500-error') throw new Exception('Mock 500 error', 500); }); +App::get('/v1/mock/tests/general/502-error') + ->desc('502 Error') + ->groups(['mock']) + ->label('scope', 'public') + ->label('sdk.auth', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) + ->label('sdk.namespace', 'general') + ->label('sdk.method', 'error502') + ->label('sdk.description', 'Mock a an 502 bad gateway.') + ->label('sdk.response.code', Response::STATUS_CODE_BAD_GATEWAY) + ->label('sdk.response.type', Response::CONTENT_TYPE_TEXT) + ->label('sdk.mock', true) + ->inject('response') + ->action(function ($response) { + /** @var Appwrite\Utopia\Response $response */ + + $response + ->setStatusCode(502) + ->text('This is a text error') + ; + }); + App::get('/v1/mock/tests/general/oauth2') ->desc('OAuth Login') ->groups(['mock']) diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index e7f7e4e84..72aea479e 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -43,7 +43,7 @@ use Appwrite\Utopia\Response\Model\Mock; // Keep last use stdClass; /** - * @method public function setStatusCode(int $code = 200): Response + * @method Response public function setStatusCode(int $code = 200): */ class Response extends SwooleResponse { From c2849a53eb6a05c8b92d2cefc547b9d1897988a4 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 6 May 2021 17:48:22 +0200 Subject: [PATCH 05/11] fix(phpdocs): remove unused char --- src/Appwrite/Utopia/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index 72aea479e..c527de3c3 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -43,7 +43,7 @@ use Appwrite\Utopia\Response\Model\Mock; // Keep last use stdClass; /** - * @method Response public function setStatusCode(int $code = 200): + * @method Response public function setStatusCode(int $code = 200) */ class Response extends SwooleResponse { From 1894ea649076ad30f3c72efc259bd88bf96c908b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 6 May 2021 17:53:07 +0200 Subject: [PATCH 06/11] fix(docs): typos --- app/controllers/mock.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index e92e0613b..f0e0d7b50 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -316,7 +316,7 @@ App::get('/v1/mock/tests/general/empty') ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'empty') - ->label('sdk.description', 'Mock a an empty response.') + ->label('sdk.description', 'Mock an empty response.') ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT) ->label('sdk.response.model', Response::MODEL_NONE) ->label('sdk.mock', true) @@ -334,7 +334,7 @@ App::get('/v1/mock/tests/general/400-error') ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error400') - ->label('sdk.description', 'Mock a an 400 failed request.') + ->label('sdk.description', 'Mock an 400 failed request.') ->label('sdk.response.code', Response::STATUS_CODE_BAD_REQUEST) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_ERROR) @@ -350,7 +350,7 @@ App::get('/v1/mock/tests/general/500-error') ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error500') - ->label('sdk.description', 'Mock a an 500 failed request.') + ->label('sdk.description', 'Mock an 500 failed request.') ->label('sdk.response.code', Response::STATUS_CODE_INTERNAL_SERVER_ERROR) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_ERROR) @@ -366,7 +366,7 @@ App::get('/v1/mock/tests/general/502-error') ->label('sdk.auth', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error502') - ->label('sdk.description', 'Mock a an 502 bad gateway.') + ->label('sdk.description', 'Mock an 502 bad gateway.') ->label('sdk.response.code', Response::STATUS_CODE_BAD_GATEWAY) ->label('sdk.response.type', Response::CONTENT_TYPE_TEXT) ->label('sdk.mock', true) From 1f91e8a4605a991bf0bfb740ce13e5a3968a91aa Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 6 May 2021 17:53:48 +0200 Subject: [PATCH 07/11] fix(docs): typos --- app/controllers/mock.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index f0e0d7b50..91318bbb8 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -334,7 +334,7 @@ App::get('/v1/mock/tests/general/400-error') ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error400') - ->label('sdk.description', 'Mock an 400 failed request.') + ->label('sdk.description', 'Mock a 400 failed request.') ->label('sdk.response.code', Response::STATUS_CODE_BAD_REQUEST) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_ERROR) @@ -350,7 +350,7 @@ App::get('/v1/mock/tests/general/500-error') ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error500') - ->label('sdk.description', 'Mock an 500 failed request.') + ->label('sdk.description', 'Mock a 500 failed request.') ->label('sdk.response.code', Response::STATUS_CODE_INTERNAL_SERVER_ERROR) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_ERROR) @@ -366,7 +366,7 @@ App::get('/v1/mock/tests/general/502-error') ->label('sdk.auth', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error502') - ->label('sdk.description', 'Mock an 502 bad gateway.') + ->label('sdk.description', 'Mock a 502 bad gateway.') ->label('sdk.response.code', Response::STATUS_CODE_BAD_GATEWAY) ->label('sdk.response.type', Response::CONTENT_TYPE_TEXT) ->label('sdk.mock', true) From ded3cbbb73cee03981f3642e69f698711a040ca8 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 7 May 2021 15:52:40 +0200 Subject: [PATCH 08/11] fix(mock): 502 error spec --- app/controllers/mock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index 91318bbb8..d70830a64 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -363,7 +363,7 @@ App::get('/v1/mock/tests/general/502-error') ->desc('502 Error') ->groups(['mock']) ->label('scope', 'public') - ->label('sdk.auth', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) + ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) ->label('sdk.namespace', 'general') ->label('sdk.method', 'error502') ->label('sdk.description', 'Mock a 502 bad gateway.') From 618324222f039a45e1f370da60c2c9d080df25af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 18:39:59 +0000 Subject: [PATCH 09/11] Bump lodash from 4.17.20 to 4.17.21 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0640d4fd5..d217ca7ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5821,9 +5821,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "lodash._escapehtmlchar": { From 72c3434860de6c14040f2d9151140f2b121a26b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 08:49:42 +0000 Subject: [PATCH 10/11] Bump hosted-git-info from 2.7.1 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.7.1 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.7.1...v2.8.9) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0640d4fd5..be7ac409d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3905,9 +3905,9 @@ } }, "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "html-encoding-sniffer": { From 33ca604f0277037203af91fad28a662472a66099 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 00:05:26 +0000 Subject: [PATCH 11/11] Bump lodash from 4.17.20 to 4.17.21 in /tests/resources/functions/node Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) Signed-off-by: dependabot[bot] --- tests/resources/functions/node/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/resources/functions/node/package-lock.json b/tests/resources/functions/node/package-lock.json index faeedef7f..060248286 100644 --- a/tests/resources/functions/node/package-lock.json +++ b/tests/resources/functions/node/package-lock.json @@ -200,9 +200,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "mime-db": { "version": "1.44.0",