From 8e331d5817a5030a1792bd047e9b1e90d24cc409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Mart=C3=ADn?= Date: Mon, 3 Sep 2018 16:42:30 -0400 Subject: [PATCH] Add 'oldUsername' to User\Event\Renamed (#1563) --- framework/core/src/User/Event/Renamed.php | 9 ++++++++- framework/core/src/User/User.php | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/framework/core/src/User/Event/Renamed.php b/framework/core/src/User/Event/Renamed.php index 1e453d64a..e24225f9a 100644 --- a/framework/core/src/User/Event/Renamed.php +++ b/framework/core/src/User/Event/Renamed.php @@ -20,6 +20,11 @@ class Renamed */ public $user; + /** + * @var string + */ + public $oldUsername; + /** * @var User */ @@ -27,11 +32,13 @@ class Renamed /** * @param User $user + * @param string $oldUsername * @param User $actor */ - public function __construct(User $user, User $actor = null) + public function __construct(User $user, string $oldUsername, User $actor = null) { $this->user = $user; + $this->oldUsername = $oldUsername; $this->actor = $actor; } } diff --git a/framework/core/src/User/User.php b/framework/core/src/User/User.php index a7567b35e..435c88301 100644 --- a/framework/core/src/User/User.php +++ b/framework/core/src/User/User.php @@ -198,9 +198,10 @@ class User extends AbstractModel public function rename($username) { if ($username !== $this->username) { + $oldUsername = $this->username; $this->username = $username; - $this->raise(new Renamed($this)); + $this->raise(new Renamed($this, $oldUsername)); } return $this;