Don't fire verified event if nothing has changed

Pascal Baljet · Pascal Baljet · commit 945e214f41e7 · 2020-01-05T22:05:22.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to `laravel-user-email` will be documented in this file
 
 ## 1.0.5 - 2020-01-05
 
+- don't fire event if nothing has changed
 - refactoring
 
 ## 1.0.4 - 2020-01-05
diff --git a/src/PendingUserEmail.php b/src/PendingUserEmail.php
@@ -55,13 +55,15 @@ public function activate()
     {
         $user = $this->user;
 
+        $dispatchEvent = !$user->hasVerifiedEmail() || $user->email !== $this->email;
+
         $user->email = $this->email;
         $user->save();
         $user->markEmailAsVerified();
 
         static::whereEmail($this->email)->get()->each->delete();
 
-        event(new Verified($user));
+        $dispatchEvent ? event(new Verified($user)) : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,15 @@ public function activate()`
`55`	`55`	`{`
`56`	`56`	`$user = $this->user;`
`57`	`57`
	`58`	`+ $dispatchEvent = !$user->hasVerifiedEmail() \|\| $user->email !== $this->email;`
	`59`	`+`
`58`	`60`	`$user->email = $this->email;`
`59`	`61`	`$user->save();`
`60`	`62`	`$user->markEmailAsVerified();`
`61`	`63`
`62`	`64`	`static::whereEmail($this->email)->get()->each->delete();`
`63`	`65`
`64`		`- event(new Verified($user));`
	`66`	`+ $dispatchEvent ? event(new Verified($user)) : null;`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`/**`