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)! diff --git a/app/controllers/mock.php b/app/controllers/mock.php index dcb8d3f29..fbafbcea4 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 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 a 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) @@ -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.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER]) + ->label('sdk.namespace', 'general') + ->label('sdk.method', 'error502') + ->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) + ->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/composer.json b/composer.json index adc813921..25bfc643c 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 700d0d785..73629a599 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": "2ecdda633a11200ce5aa2042f41395ce", + "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", diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index 0bed14e45..0ce7010f6 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -44,7 +44,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 { 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",