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

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/User/Command/DeleteAvatarHandler.php
View File

@@ -15,8 +15,9 @@ use Flarum\Foundation\DispatchEventsTrait;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\AvatarDeleting;
use Flarum\User\UserRepository;
use Flarum\Core\AvatarUploader;
use Flarum\Event\AvatarWillBeDeleted;
use Illuminate\Contracts\Events\Dispatcher;
use League\Flysystem\FilesystemInterface;
class DeleteAvatarHandler
{
@@ -29,20 +30,20 @@ class DeleteAvatarHandler
protected $users;
/**
* @var FilesystemInterface
* @var AvatarUploader
*/
protected $uploadDir;
protected $uploader;
/**
* @param Dispatcher $events
* @param UserRepository $users
* @param FilesystemInterface $uploadDir
* @param AvatarUploader $uploader
*/
public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir)
public function __construct(Dispatcher $events, UserRepository $users, AvatarUploader $uploader)
{
$this->events = $events;
$this->users = $users;
$this->uploadDir = $uploadDir;
$this->uploader = $uploader;
}
/**
@@ -60,8 +61,7 @@ class DeleteAvatarHandler
$this->assertCan($actor, 'edit', $user);
}
$avatarPath = $user->avatar_path;
$user->changeAvatarPath(null);
$this->uploader->remove($user);
$this->events->fire(
new AvatarDeleting($user, $actor)
@@ -69,10 +69,6 @@ class DeleteAvatarHandler
$user->save();
if ($this->uploadDir->has($avatarPath)) {
$this->uploadDir->delete($avatarPath);
}
$this->dispatchEventsFor($user, $actor);
return $user;