Clear before creating new one

Pascal Baljet · Pascal Baljet · commit 10e39489c989 · 2020-01-05T22:01:51.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-user-email` will be documented in this file
 
+## 1.0.5 - 2020-01-05
+
+- refactoring
+
 ## 1.0.4 - 2020-01-05
 
 - publishes the migration only once
diff --git a/src/MustVerifyNewEmail.php b/src/MustVerifyNewEmail.php
@@ -18,8 +18,6 @@ trait MustVerifyNewEmail
      */
     public function newEmail(string $email):?PendingUserEmail
     {
-        $this->clearPendingEmail();
-
         if ($this->getEmailForVerification() === $email && $this->hasVerifiedEmail()) {
             return null;
         }
@@ -37,6 +35,8 @@ public function newEmail(string $email):?PendingUserEmail
      */
     public function createPendingUserEmailModel(string $email): PendingUserEmail
     {
+        $this->clearPendingEmail();
+
         return PendingUserEmail::create([
             'user_type' => get_class($this),
             'user_id'   => $this->getKey(),

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ trait MustVerifyNewEmail`
`18`	`18`	`*/`
`19`	`19`	`public function newEmail(string $email):?PendingUserEmail`
`20`	`20`	`{`
`21`		`- $this->clearPendingEmail();`
`22`		`-`
`23`	`21`	`if ($this->getEmailForVerification() === $email && $this->hasVerifiedEmail()) {`
`24`	`22`	`return null;`
`25`	`23`	`}`
`@@ -37,6 +35,8 @@ public function newEmail(string $email):?PendingUserEmail`
`37`	`35`	`*/`
`38`	`36`	`public function createPendingUserEmailModel(string $email): PendingUserEmail`
`39`	`37`	`{`
	`38`	`+ $this->clearPendingEmail();`
	`39`	`+`
`40`	`40`	`return PendingUserEmail::create([`
`41`	`41`	`'user_type' => get_class($this),`
`42`	`42`	`'user_id' => $this->getKey(),`