From 4fd0e9e02deceb92cd46e119b4041347fb6307c5 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 3 Mar 2024 13:10:25 +0000 Subject: [PATCH 1/6] supporting mime types fo avif and heic images --- app/config/storage/mimes.php | 2 ++ app/config/storage/outputs.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/app/config/storage/mimes.php b/app/config/storage/mimes.php index 5d315f45bc..a9eaec59d3 100644 --- a/app/config/storage/mimes.php +++ b/app/config/storage/mimes.php @@ -6,6 +6,8 @@ return [ 'image/gif', 'image/png', 'image/webp', + 'image/heic', + 'image/avif', // Video Files 'video/mp4', diff --git a/app/config/storage/outputs.php b/app/config/storage/outputs.php index 507a9ce667..8de4f18599 100644 --- a/app/config/storage/outputs.php +++ b/app/config/storage/outputs.php @@ -6,4 +6,7 @@ return [ // Accepted outputs files 'gif' => 'image/gif', 'png' => 'image/png', 'webp' => 'image/webp', + 'heic' => 'image/heic', + 'heics' => 'image/heic', + 'avif' => 'image/avif' ]; From 9a140f90d48dbfc998812ec7413af4e836c4b7ce Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Fri, 9 Aug 2024 14:12:10 +0000 Subject: [PATCH 2/6] update image library --- app/console | 1 + composer.json | 2 +- composer.lock | 62 ++++++++++++++++++++++++++------------------------- 3 files changed, 34 insertions(+), 31 deletions(-) create mode 160000 app/console diff --git a/app/console b/app/console new file mode 160000 index 0000000000..412bc33318 --- /dev/null +++ b/app/console @@ -0,0 +1 @@ +Subproject commit 412bc3331891c15ba7baf4f445e82ac3a678c6be diff --git a/composer.json b/composer.json index 3bb2816028..8a87b3be12 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "utopia-php/dsn": "0.2.1", "utopia-php/framework": "0.33.*", "utopia-php/fetch": "0.2.*", - "utopia-php/image": "0.6.*", + "utopia-php/image": "dev-feat-avif-support", "utopia-php/locale": "0.4.*", "utopia-php/logger": "0.5.*", "utopia-php/messaging": "0.12.*", diff --git a/composer.lock b/composer.lock index 27c11b9af2..fa3519afbf 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": "fc07cbc344782534962fd7bf0769f7b9", + "content-hash": "718915e811d332c864cee267c56a35c8", "packages": [ { "name": "adhocore/jwt", @@ -1721,16 +1721,16 @@ }, { "name": "utopia-php/database", - "version": "0.50.2", + "version": "0.50.3", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "c712d1f6c8ec37886a7a1ad4d60a8cd75dec00aa" + "reference": "4287e6625c7273411c7322abd151c4285ee7b50f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/c712d1f6c8ec37886a7a1ad4d60a8cd75dec00aa", - "reference": "c712d1f6c8ec37886a7a1ad4d60a8cd75dec00aa", + "url": "https://api.github.com/repos/utopia-php/database/zipball/4287e6625c7273411c7322abd151c4285ee7b50f", + "reference": "4287e6625c7273411c7322abd151c4285ee7b50f", "shasum": "" }, "require": { @@ -1771,9 +1771,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/0.50.2" + "source": "https://github.com/utopia-php/database/tree/0.50.3" }, - "time": "2024-07-31T10:12:19+00:00" + "time": "2024-08-08T01:40:54+00:00" }, { "name": "utopia-php/domains", @@ -1968,21 +1968,21 @@ }, { "name": "utopia-php/image", - "version": "0.6.1", + "version": "dev-feat-avif-support", "source": { "type": "git", "url": "https://github.com/utopia-php/image.git", - "reference": "2d74c27e69e65a93cf94a16586598a04fe435bf0" + "reference": "7be404a23399dbb06585f8c78ed61a375a090450" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/image/zipball/2d74c27e69e65a93cf94a16586598a04fe435bf0", - "reference": "2d74c27e69e65a93cf94a16586598a04fe435bf0", + "url": "https://api.github.com/repos/utopia-php/image/zipball/7be404a23399dbb06585f8c78ed61a375a090450", + "reference": "7be404a23399dbb06585f8c78ed61a375a090450", "shasum": "" }, "require": { "ext-imagick": "*", - "php": ">=8.0" + "php": ">=8.1" }, "require-dev": { "laravel/pint": "1.2.*", @@ -2010,9 +2010,9 @@ ], "support": { "issues": "https://github.com/utopia-php/image/issues", - "source": "https://github.com/utopia-php/image/tree/0.6.1" + "source": "https://github.com/utopia-php/image/tree/feat-avif-support" }, - "time": "2024-02-05T13:31:44+00:00" + "time": "2024-07-29T13:22:58+00:00" }, { "name": "utopia-php/locale", @@ -2990,16 +2990,16 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "0.39.4", + "version": "0.39.6", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "501b92d73ae55e0f880ed00f57bc64a54d0ce137" + "reference": "00e6f9e77ea380d8ab3138a36548b353077e4061" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/501b92d73ae55e0f880ed00f57bc64a54d0ce137", - "reference": "501b92d73ae55e0f880ed00f57bc64a54d0ce137", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/00e6f9e77ea380d8ab3138a36548b353077e4061", + "reference": "00e6f9e77ea380d8ab3138a36548b353077e4061", "shasum": "" }, "require": { @@ -3035,9 +3035,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/0.39.4" + "source": "https://github.com/appwrite/sdk-generator/tree/0.39.6" }, - "time": "2024-07-26T22:34:10+00:00" + "time": "2024-08-08T12:44:28+00:00" }, { "name": "doctrine/deprecations", @@ -3158,16 +3158,16 @@ }, { "name": "laravel/pint", - "version": "v1.17.1", + "version": "v1.17.2", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "b5b6f716db298671c1dfea5b1082ec2c0ae7064f" + "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/b5b6f716db298671c1dfea5b1082ec2c0ae7064f", - "reference": "b5b6f716db298671c1dfea5b1082ec2c0ae7064f", + "url": "https://api.github.com/repos/laravel/pint/zipball/e8a88130a25e3f9d4d5785e6a1afca98268ab110", + "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110", "shasum": "" }, "require": { @@ -3178,13 +3178,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.59.3", - "illuminate/view": "^10.48.12", - "larastan/larastan": "^2.9.7", + "friendsofphp/php-cs-fixer": "^3.61.1", + "illuminate/view": "^10.48.18", + "larastan/larastan": "^2.9.8", "laravel-zero/framework": "^10.4.0", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.34.8" + "pestphp/pest": "^2.35.0" }, "bin": [ "builds/pint" @@ -3220,7 +3220,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-08-01T09:06:33+00:00" + "time": "2024-08-06T15:11:54+00:00" }, { "name": "matthiasmullie/minify", @@ -5593,7 +5593,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "utopia-php/image": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From 14cd43ddfdc19a2dbb6de732134c900522847cfc Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 2 Oct 2024 05:59:46 +0000 Subject: [PATCH 3/6] disable heic --- app/config/storage/outputs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/storage/outputs.php b/app/config/storage/outputs.php index 8de4f18599..cde2a9f38a 100644 --- a/app/config/storage/outputs.php +++ b/app/config/storage/outputs.php @@ -6,7 +6,7 @@ return [ // Accepted outputs files 'gif' => 'image/gif', 'png' => 'image/png', 'webp' => 'image/webp', - 'heic' => 'image/heic', - 'heics' => 'image/heic', + // 'heic' => 'image/heic', + // 'heics' => 'image/heic', 'avif' => 'image/avif' ]; From d4195aa3a6a988b540a23b4e2abf6e666bd354bb Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 2 Oct 2024 06:02:10 +0000 Subject: [PATCH 4/6] update utopia image --- composer.json | 2 +- composer.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 62efee278e..575973e54d 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ "utopia-php/dsn": "0.2.1", "utopia-php/framework": "0.33.*", "utopia-php/fetch": "0.2.*", - "utopia-php/image": "dev-feat-avif-support", + "utopia-php/image": "0.7.*", "utopia-php/locale": "0.4.*", "utopia-php/logger": "0.6.*", "utopia-php/messaging": "0.12.*", diff --git a/composer.lock b/composer.lock index d0ce3f7384..93672e670e 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": "1981099f3c47f5536298222ba9b0b994", + "content-hash": "66e31af1f7d0d1617694a1c5a975f887", "packages": [ { "name": "adhocore/jwt", @@ -1970,16 +1970,16 @@ }, { "name": "utopia-php/image", - "version": "dev-feat-avif-support", + "version": "0.7.0", "source": { "type": "git", "url": "https://github.com/utopia-php/image.git", - "reference": "7be404a23399dbb06585f8c78ed61a375a090450" + "reference": "fcea143edbad524bf871ddbebe801d981f91f181" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/image/zipball/7be404a23399dbb06585f8c78ed61a375a090450", - "reference": "7be404a23399dbb06585f8c78ed61a375a090450", + "url": "https://api.github.com/repos/utopia-php/image/zipball/fcea143edbad524bf871ddbebe801d981f91f181", + "reference": "fcea143edbad524bf871ddbebe801d981f91f181", "shasum": "" }, "require": { @@ -2012,9 +2012,9 @@ ], "support": { "issues": "https://github.com/utopia-php/image/issues", - "source": "https://github.com/utopia-php/image/tree/feat-avif-support" + "source": "https://github.com/utopia-php/image/tree/0.7.0" }, - "time": "2024-07-29T13:22:58+00:00" + "time": "2024-10-02T05:45:38+00:00" }, { "name": "utopia-php/locale", @@ -6995,9 +6995,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "utopia-php/image": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From d290460202d85d5d8b58c119e14ed2b54f23c4d8 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 2 Oct 2024 06:06:49 +0000 Subject: [PATCH 5/6] disable heic in mime --- app/config/storage/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/storage/mimes.php b/app/config/storage/mimes.php index a9eaec59d3..df325b37e9 100644 --- a/app/config/storage/mimes.php +++ b/app/config/storage/mimes.php @@ -6,7 +6,7 @@ return [ 'image/gif', 'image/png', 'image/webp', - 'image/heic', + // 'image/heic', 'image/avif', // Video Files From 825c32eb17a1122f97c0c0bf7dd64f5c3b50c2e9 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 2 Oct 2024 06:13:09 +0000 Subject: [PATCH 6/6] remove submodule --- app/console | 1 - 1 file changed, 1 deletion(-) delete mode 160000 app/console diff --git a/app/console b/app/console deleted file mode 160000 index 412bc33318..0000000000 --- a/app/console +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 412bc3331891c15ba7baf4f445e82ac3a678c6be