From d2305a790058fda15ce6c1e459e2a045d5c058a8 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 16 Aug 2022 20:45:55 +0000 Subject: [PATCH 1/2] feat: update abuse library --- composer.json | 2 +- composer.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index ca95433f4c..c87442a5b4 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "appwrite/php-runtimes": "0.10.*", "utopia-php/framework": "0.20.*", "utopia-php/logger": "0.3.*", - "utopia-php/abuse": "dev-refactor-permissions", + "utopia-php/abuse": "0.9.*", "utopia-php/analytics": "0.2.*", "utopia-php/audit": "0.10.*", "utopia-php/cache": "0.6.*", diff --git a/composer.lock b/composer.lock index 5196acb811..f8d5de1ba8 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": "b252bbca91fb272469ad1aab83cbfe93", + "content-hash": "6d01d58d1ac6cccd4684ec70e4b2ed56", "packages": [ { "name": "adhocore/jwt", @@ -1733,17 +1733,17 @@ }, { "name": "utopia-php/abuse", - "version": "dev-refactor-permissions", + "version": "0.9.0", "source": { "type": "git", "url": "https://github.com/utopia-php/abuse.git", - "reference": "c5e5bdaa190e1c9993d35a04c78a46870a1265bb" + "reference": "34156bb5292d704bb8bc8141bb5151126ed4830a" }, "require": { "ext-curl": "*", "ext-pdo": "*", "php": ">=8.0", - "utopia-php/database": ">=0.11 <1.0" + "utopia-php/database": "0.20.0" }, "require-dev": { "phpunit/phpunit": "^9.4", @@ -1772,7 +1772,7 @@ "upf", "utopia" ], - "time": "2022-08-14T23:58:51+00:00" + "time": "2022-08-15T07:35:56+00:00" }, { "name": "utopia-php/analytics", @@ -5321,9 +5321,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "utopia-php/abuse": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -5345,5 +5343,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From 11ad9c8dd90488610d1f50817b4e2db14f6331b0 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 16 Aug 2022 20:47:05 +0000 Subject: [PATCH 2/2] feat: update abuse library --- src/Appwrite/Utopia/Response/Model/AttributeDatetime.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php b/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php index c6973cdc57..4fae89384f 100644 --- a/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php +++ b/src/Appwrite/Utopia/Response/Model/AttributeDatetime.php @@ -21,11 +21,7 @@ class AttributeDatetime extends Attribute 'type' => self::TYPE_DATETIME, 'description' => 'Attribute type.', 'default' => '', -<<<<<<< HEAD - 'example' => self::TYPE_DATETIME, -======= 'example' => self::TYPE_DATETIME_EXAMPLE, ->>>>>>> fd76332aca89626d227d6ea812eb675338558a87 ]) ->addRule('format', [ 'type' => self::TYPE_DATETIME,