mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-21 11:46:05 +02:00
Code Issues Releases Wiki Activity

feat: Allow switching the ImageManager driver (#3195)

Browse Source
This commit is contained in:
Ian Morland
2021-12-12 21:34:10 +00:00
committed by GitHub
parent 7be0c02ba1
commit bd8ebb00a0
6 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Api/Controller/UploadFaviconController.php
View File

@@ -28,15 +28,21 @@ class UploadFaviconController extends UploadImageController
*/
protected $translator;
/**
* @var ImageManager
*/
protected $imageManager;
/**
* @param SettingsRepositoryInterface $settings
* @param Factory $filesystemFactory
*/
public function __construct(SettingsRepositoryInterface $settings, Factory $filesystemFactory, TranslatorInterface $translator)
public function __construct(SettingsRepositoryInterface $settings, Factory $filesystemFactory, TranslatorInterface $translator, ImageManager $imageManager)
{
parent::__construct($settings, $filesystemFactory);
$this->translator = $translator;
$this->imageManager = $imageManager;
}
/**
@@ -56,9 +62,7 @@ class UploadFaviconController extends UploadImageController
]);
}
$manager = new ImageManager();
$encodedImage = $manager->make($file->getStream())->resize(64, 64, function ($constraint) {
$encodedImage = $this->imageManager->make($file->getStream())->resize(64, 64, function ($constraint) {
$constraint->aspectRatio();
$constraint->upsize();
})->encode('png');

18
src/Api/Controller/UploadLogoController.php
View File

@@ -9,6 +9,8 @@
namespace Flarum\Api\Controller;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Filesystem\Factory;
use Intervention\Image\Image;
use Intervention\Image\ImageManager;
use Psr\Http\Message\UploadedFileInterface;
@@ -19,14 +21,24 @@ class UploadLogoController extends UploadImageController
protected $filenamePrefix = 'logo';
/**
* @var ImageManager
*/
protected $imageManager;
public function __construct(SettingsRepositoryInterface $settings, Factory $filesystemFactory, ImageManager $imageManager)
{
parent::__construct($settings, $filesystemFactory);
$this->imageManager = $imageManager;
}
/**
* {@inheritdoc}
*/
protected function makeImage(UploadedFileInterface $file): Image
{
$manager = new ImageManager();
$encodedImage = $manager->make($file->getStream())->heighten(60, function ($constraint) {
$encodedImage = $this->imageManager->make($file->getStream())->heighten(60, function ($constraint) {
$constraint->upsize();
})->encode('png');