1
0
mirror of https://github.com/flarum/core.git synced 2025-10-18 18:26:07 +02:00

merges 5.5 and master into next-back

This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
104 changed files with 1723 additions and 1828 deletions

View File

@@ -12,6 +12,7 @@
namespace Flarum\User\Event;
use Flarum\User\User;
use Intervention\Image\Image;
class AvatarSaving
{
@@ -30,21 +31,21 @@ class AvatarSaving
public $actor;
/**
* The path to the avatar that will be saved.
* The image that will be saved.
*
* @var string
* @var Image
*/
public $path;
public $image;
/**
* @param User $user The user whose avatar will be saved.
* @param User $actor The user performing the action.
* @param string $path The path to the avatar that will be saved.
* @param Image $image The image that will be saved.
*/
public function __construct(User $user, User $actor, $path)
public function __construct(User $user, User $actor, Image $image)
{
$this->user = $user;
$this->actor = $actor;
$this->path = $path;
$this->image = $image;
}
}