From 7e04823d8212b3bc47887f9b68d131120341d2d1 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 26 Jun 2017 23:30:51 +0200 Subject: [PATCH] Move event to Flarum\User namespace --- .../CheckUserPassword.php => User/Event/CheckingPassword.php} | 4 ++-- framework/core/src/User/User.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename framework/core/src/{Event/CheckUserPassword.php => User/Event/CheckingPassword.php} (91%) diff --git a/framework/core/src/Event/CheckUserPassword.php b/framework/core/src/User/Event/CheckingPassword.php similarity index 91% rename from framework/core/src/Event/CheckUserPassword.php rename to framework/core/src/User/Event/CheckingPassword.php index fa9ef2277..97f73227c 100644 --- a/framework/core/src/Event/CheckUserPassword.php +++ b/framework/core/src/User/Event/CheckingPassword.php @@ -9,11 +9,11 @@ * file that was distributed with this source code. */ -namespace Flarum\Event; +namespace Flarum\User\Event; use Flarum\User\User; -class CheckUserPassword +class CheckingPassword { /** * @var User diff --git a/framework/core/src/User/User.php b/framework/core/src/User/User.php index 8c9cce87f..78858643e 100755 --- a/framework/core/src/User/User.php +++ b/framework/core/src/User/User.php @@ -14,7 +14,6 @@ namespace Flarum\User; use DomainException; use Flarum\Database\AbstractModel; use Flarum\Database\ScopeVisibilityTrait; -use Flarum\Event\CheckUserPassword; use Flarum\Event\ConfigureUserPreferences; use Flarum\Event\PrepareUserGroups; use Flarum\Foundation\Application; @@ -26,6 +25,7 @@ use Flarum\Post\Event\Deleted as PostDeleted; use Flarum\User\Event\Activated; use Flarum\User\Event\AvatarChanged; use Flarum\User\Event\BioChanged; +use Flarum\User\Event\CheckingPassword; use Flarum\User\Event\Deleted; use Flarum\User\Event\EmailChanged; use Flarum\User\Event\EmailChangeRequested; @@ -350,7 +350,7 @@ class User extends AbstractModel */ public function checkPassword($password) { - $valid = static::$dispatcher->until(new CheckUserPassword($this, $password)); + $valid = static::$dispatcher->until(new CheckingPassword($this, $password)); if ($valid !== null) { return $valid;