Merge pull request #147 from ajmedway/patch-2

Bugfix for Model events UserEvent::EVENT_BEFORE_CONFIRMATION and Use…
This commit is contained in:
Antonio Ramirez
2018-02-09 12:40:24 +01:00
committed by GitHub

View File

@ -14,9 +14,12 @@ namespace Da\User\Service;
use Da\User\Contracts\ServiceInterface; use Da\User\Contracts\ServiceInterface;
use Da\User\Event\UserEvent; use Da\User\Event\UserEvent;
use Da\User\Model\User; use Da\User\Model\User;
use Da\User\Traits\MailAwareTrait;
class UserConfirmationService implements ServiceInterface class UserConfirmationService implements ServiceInterface
{ {
use MailAwareTrait;
protected $model; protected $model;
public function __construct(User $model) public function __construct(User $model)
@ -26,9 +29,12 @@ class UserConfirmationService implements ServiceInterface
public function run() public function run()
{ {
$this->model->trigger(UserEvent::EVENT_BEFORE_CONFIRMATION); $model = $this->model;
$event = $this->make(UserEvent::class, [$model]);
$this->model->trigger(UserEvent::EVENT_BEFORE_CONFIRMATION, $event);
if ((bool)$this->model->updateAttributes(['confirmed_at' => time()])) { if ((bool)$this->model->updateAttributes(['confirmed_at' => time()])) {
$this->model->trigger(UserEvent::EVENT_AFTER_CONFIRMATION); $this->model->trigger(UserEvent::EVENT_AFTER_CONFIRMATION, $event);
return true; return true;
} }