From 28b3072b52dd7d04cacf932144667aa705fc0cbb Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 2 Aug 2021 11:15:13 +0545 Subject: [PATCH 1/3] modifying mock api for keywords test --- app/controllers/mock.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index 17bade579..8e588050d 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -113,8 +113,8 @@ App::get('/v1/mock/tests/bar') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) - ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('required', '', new Text(100), 'Sample string param') + ->param('default', '', new Numeric(), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -131,8 +131,8 @@ App::post('/v1/mock/tests/bar') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) - ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('required', '', new Text(100), 'Sample string param') + ->param('default', '', new Numeric(), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -149,8 +149,8 @@ App::patch('/v1/mock/tests/bar') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) - ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('required', '', new Text(100), 'Sample string param') + ->param('default', '', new Numeric(), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -167,8 +167,8 @@ App::put('/v1/mock/tests/bar') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) - ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('required', '', new Text(100), 'Sample string param') + ->param('default', '', new Numeric(), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -185,8 +185,8 @@ App::delete('/v1/mock/tests/bar') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) - ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('required', '', new Text(100), 'Sample string param') + ->param('default', '', new Numeric(), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); From 9ede80f0c236fa2c85ce0ca4d3746d927fd896b0 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 2 Aug 2021 16:23:42 +0545 Subject: [PATCH 2/3] update mock api validators --- app/controllers/mock.php | 24 ++++++++++++------------ composer.json | 2 +- composer.lock | 30 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index 8e588050d..b9c25e46b 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -7,7 +7,7 @@ use Appwrite\Network\Validator\Host; use Appwrite\Utopia\Response; use Utopia\App; use Utopia\Validator\ArrayList; -use Utopia\Validator\Numeric; +use Utopia\Validator\Integer; use Utopia\Validator\Text; use Utopia\Storage\Validator\File; @@ -24,7 +24,7 @@ App::get('/v1/mock/tests/foo') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -42,7 +42,7 @@ App::post('/v1/mock/tests/foo') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -60,7 +60,7 @@ App::patch('/v1/mock/tests/foo') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -78,7 +78,7 @@ App::put('/v1/mock/tests/foo') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -96,7 +96,7 @@ App::delete('/v1/mock/tests/foo') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -114,7 +114,7 @@ App::get('/v1/mock/tests/bar') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('required', '', new Text(100), 'Sample string param') - ->param('default', '', new Numeric(), 'Sample numeric param') + ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -132,7 +132,7 @@ App::post('/v1/mock/tests/bar') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('required', '', new Text(100), 'Sample string param') - ->param('default', '', new Numeric(), 'Sample numeric param') + ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -150,7 +150,7 @@ App::patch('/v1/mock/tests/bar') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('required', '', new Text(100), 'Sample string param') - ->param('default', '', new Numeric(), 'Sample numeric param') + ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -168,7 +168,7 @@ App::put('/v1/mock/tests/bar') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('required', '', new Text(100), 'Sample string param') - ->param('default', '', new Numeric(), 'Sample numeric param') + ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -186,7 +186,7 @@ App::delete('/v1/mock/tests/bar') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('required', '', new Text(100), 'Sample string param') - ->param('default', '', new Numeric(), 'Sample numeric param') + ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->action(function ($x, $y, $z) { }); @@ -230,7 +230,7 @@ App::post('/v1/mock/tests/general/upload') ->label('sdk.response.model', Response::MODEL_MOCK) ->label('sdk.mock', true) ->param('x', '', new Text(100), 'Sample string param') - ->param('y', '', new Numeric(), 'Sample numeric param') + ->param('y', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') ->param('file', [], new File(), 'Sample file param', false) ->inject('request') diff --git a/composer.json b/composer.json index 14db659b0..fe173521c 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "appwrite/php-clamav": "1.1.*", "appwrite/php-runtimes": "0.4.*", - "utopia-php/framework": "0.14.*", + "utopia-php/framework": "0.17.*", "utopia-php/abuse": "0.5.*", "utopia-php/analytics": "0.2.*", "utopia-php/audit": "0.5.*", diff --git a/composer.lock b/composer.lock index 406f05661..9db0fcb30 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": "5eb826a115f7b63868ed48bd89238ffe", + "content-hash": "63a89a825697892a52aa27d6819b5972", "packages": [ { "name": "adhocore/jwt", @@ -1756,16 +1756,16 @@ }, { "name": "utopia-php/framework", - "version": "0.14.1", + "version": "0.17.2", "source": { "type": "git", "url": "https://github.com/utopia-php/framework.git", - "reference": "632113288bebe41cbef79f0d355bd91609767b8c" + "reference": "3cd5fa2a9e30040277861f4254c5ccd1b1600952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/framework/zipball/632113288bebe41cbef79f0d355bd91609767b8c", - "reference": "632113288bebe41cbef79f0d355bd91609767b8c", + "url": "https://api.github.com/repos/utopia-php/framework/zipball/3cd5fa2a9e30040277861f4254c5ccd1b1600952", + "reference": "3cd5fa2a9e30040277861f4254c5ccd1b1600952", "shasum": "" }, "require": { @@ -1799,9 +1799,9 @@ ], "support": { "issues": "https://github.com/utopia-php/framework/issues", - "source": "https://github.com/utopia-php/framework/tree/0.14.1" + "source": "https://github.com/utopia-php/framework/tree/0.17.2" }, - "time": "2021-05-21T06:41:45+00:00" + "time": "2021-08-02T10:18:26+00:00" }, { "name": "utopia-php/image", @@ -2606,21 +2606,21 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" + "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", - "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" + "psr/log": "^1 || ^2 || ^3" }, "require-dev": { "phpstan/phpstan": "^0.12.55", @@ -2650,7 +2650,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" }, "funding": [ { @@ -2666,7 +2666,7 @@ "type": "tidelift" } ], - "time": "2021-05-05T19:37:51+00:00" + "time": "2021-07-31T17:03:58+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -6090,5 +6090,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From 3b3df02f807d44ea9e7b44dfbae63f63c7c8a9ac Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 2 Aug 2021 16:29:22 +0545 Subject: [PATCH 3/3] fix param naming --- app/controllers/mock.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/mock.php b/app/controllers/mock.php index b9c25e46b..2cad650f5 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -116,7 +116,7 @@ App::get('/v1/mock/tests/bar') ->param('required', '', new Text(100), 'Sample string param') ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') - ->action(function ($x, $y, $z) { + ->action(function ($required, $default, $z) { }); App::post('/v1/mock/tests/bar') @@ -134,7 +134,7 @@ App::post('/v1/mock/tests/bar') ->param('required', '', new Text(100), 'Sample string param') ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') - ->action(function ($x, $y, $z) { + ->action(function ($required, $default, $z) { }); App::patch('/v1/mock/tests/bar') @@ -152,7 +152,7 @@ App::patch('/v1/mock/tests/bar') ->param('required', '', new Text(100), 'Sample string param') ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') - ->action(function ($x, $y, $z) { + ->action(function ($required, $default, $z) { }); App::put('/v1/mock/tests/bar') @@ -170,7 +170,7 @@ App::put('/v1/mock/tests/bar') ->param('required', '', new Text(100), 'Sample string param') ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') - ->action(function ($x, $y, $z) { + ->action(function ($required, $default, $z) { }); App::delete('/v1/mock/tests/bar') @@ -188,7 +188,7 @@ App::delete('/v1/mock/tests/bar') ->param('required', '', new Text(100), 'Sample string param') ->param('default', '', new Integer(true), 'Sample numeric param') ->param('z', null, new ArrayList(new Text(256)), 'Sample array param') - ->action(function ($x, $y, $z) { + ->action(function ($required, $default, $z) { }); App::get('/v1/mock/tests/general/download')