mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 07:24:27 +02:00
Code Issues Releases Wiki Activity

More helpful avatar upload error messages

Browse Source 
ref #165, #118
This commit is contained in:
Toby Zerner
2015-10-22 10:39:38 +10:30
parent a471a44ca6
commit ea98e4bda9
4 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Core/Command/UploadAvatarHandler.php
View File

@@ -11,17 +11,19 @@
namespace Flarum\Core\Command;
use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\Event\AvatarWillBeSaved;
use Flarum\Core\Repository\UserRepository;
use Flarum\Core\Support\DispatchEventsTrait;
use Flarum\Core\Validator\AvatarValidator;
use Flarum\Event\AvatarWillBeSaved;
use Flarum\Foundation\Application;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use League\Flysystem\FilesystemInterface;
use League\Flysystem\MountManager;
use Intervention\Image\ImageManager;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class UploadAvatarHandler
{
@@ -43,17 +45,25 @@ class UploadAvatarHandler
*/
protected $app;
/**
* @var AvatarValidator
*/
protected $validator;
/**
* @param Dispatcher $events
* @param UserRepository $users
* @param FilesystemInterface $uploadDir
* @param Application $app
* @param AvatarValidator $validator
*/
public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir, Application $app)
public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir, Application $app, AvatarValidator $validator)
{
$this->events = $events;
$this->users = $users;
$this->uploadDir = $uploadDir;
$this->app = $app;
$this->validator = $validator;
}
/**
@@ -74,6 +84,17 @@ class UploadAvatarHandler
$tmpFile = tempnam($this->app->storagePath().'/tmp', 'avatar');
$command->file->moveTo($tmpFile);
$file = new UploadedFile(
$tmpFile,
$command->file->getClientFilename(),
$command->file->getClientMediaType(),
$command->file->getSize(),
$command->file->getError(),
true
);
$this->validator->assertValid(['avatar' => $file]);
$manager = new ImageManager;
$manager->make($tmpFile)->fit(100, 100)->save();