diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php index dbbd59f8c3..dd1d4a0d69 100644 --- a/app/controllers/api/health.php +++ b/app/controllers/api/health.php @@ -267,7 +267,7 @@ App::get('/v1/health/anti-virus') 'status' => (@$antiVirus->ping()) ? 'online' : 'offline', 'version' => @$antiVirus->version(), ]); - } catch( \Exception $e) { + } catch( RuntimeException $e) { $response->json([ 'status' => 'offline', 'version' => '', diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index c4fe8c8494..b3060eaf4b 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -242,7 +242,6 @@ App::get('/v1/storage/files/:fileId/preview') ->param('fileId', '', new UID(), 'File unique ID') ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true) ->param('height', 0, new Range(0, 4000), 'Resize preview image height, Pass an integer between 0 to 4000.', true) - ->param('gravity', Image::GRAVITY_CENTER, new WhiteList([Image::GRAVITY_CENTER, Image::GRAVITY_NORTH, Image::GRAVITY_NORTHWEST, Image::GRAVITY_NORTHEAST, Image::GRAVITY_WEST, Image::GRAVITY_EAST, Image::GRAVITY_SOUTHWEST, Image::GRAVITY_SOUTH, Image::GRAVITY_SOUTHEAST]), 'Image crop gravity', true) ->param('quality', 100, new Range(0, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to 100.', true) ->param('borderWidth', 0, new Range(0, 100), 'Preview image border in pixels. Pass an integer between 0 to 100. Defaults to 0.', true) ->param('borderColor', '', new HexColor(), 'Preview image border color. Use a valid HEX color, no # is needed for prefix.', true) @@ -255,7 +254,7 @@ App::get('/v1/storage/files/:fileId/preview') ->inject('response') ->inject('project') ->inject('projectDB') - ->action(function ($fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $projectDB) { + ->action(function ($fileId, $width, $height, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $projectDB) { /** @var Utopia\Swoole\Request $request */ /** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Database\Document $project */ @@ -343,7 +342,7 @@ App::get('/v1/storage/files/:fileId/preview') $image = new Image($source); - $image->crop((int) $width, (int) $height, $gravity); + $image->crop((int) $width, (int) $height); if (!empty($opacity) || $opacity==0) { $image->setOpacity($opacity); diff --git a/composer.json b/composer.json index 08c2971909..c36ee333eb 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "utopia-php/domains": "1.1.*", "utopia-php/swoole": "0.2.*", "utopia-php/storage": "0.5.*", - "utopia-php/image": "0.3.*", + "utopia-php/image": "0.2.*", "resque/php-resque": "1.3.6", "matomo/device-detector": "4.2.2", "dragonmantank/cron-expression": "3.1.0", diff --git a/composer.lock b/composer.lock index 6ccb94564a..d38db66866 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": "399d2426ca92e04b6d6fb84a91c316c3", + "content-hash": "19426f6ef8c8da256a0ff0fba2c11051", "packages": [ { "name": "adhocore/jwt", @@ -1742,16 +1742,16 @@ }, { "name": "utopia-php/image", - "version": "0.3.2", + "version": "0.2.1", "source": { "type": "git", "url": "https://github.com/utopia-php/image.git", - "reference": "2044fdd44d87c4253cfe929cca975fd037461b00" + "reference": "0754955a165483852184d1215cc3bf659432d23a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/image/zipball/2044fdd44d87c4253cfe929cca975fd037461b00", - "reference": "2044fdd44d87c4253cfe929cca975fd037461b00", + "url": "https://api.github.com/repos/utopia-php/image/zipball/0754955a165483852184d1215cc3bf659432d23a", + "reference": "0754955a165483852184d1215cc3bf659432d23a", "shasum": "" }, "require": { @@ -1789,9 +1789,9 @@ ], "support": { "issues": "https://github.com/utopia-php/image/issues", - "source": "https://github.com/utopia-php/image/tree/0.3.2" + "source": "https://github.com/utopia-php/image/tree/0.2.1" }, - "time": "2021-06-10T09:16:11+00:00" + "time": "2021-04-13T07:47:24+00:00" }, { "name": "utopia-php/locale", @@ -6025,5 +6025,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" }