Merge pull request #3 from anomalylabs/2.6

Sync

Author: MostafaMoradii

docs/en/04.extensions/02.authenticators.md

@@ -117,7 +117,7 @@ The extension you create must extend the `\Anomaly\UsersModule\User\Authenticato
          */
         public function authenticate(array $credentials)
         {
-            return $this->dispatch(new AuthenticateCredentials($credentials));
+            return dispatch_sync(new AuthenticateCredentials($credentials));
         }
     }
 
@@ -129,7 +129,7 @@ The primary task of any authenticators is to authenticate a login request. In th
 
     public function authenticate(array $credentials)
     {
-        return $this->dispatch(new AuthenticateCredentials($credentials));
+        return dispatch_sync(new AuthenticateCredentials($credentials));
     }
 
 Our `AuthenticateCredentials` command is responsible for the actual work:

docs/en/04.extensions/03.security-checks.md

@@ -128,7 +128,7 @@ The extension you create must extend the `\Anomaly\UsersModule\User\Security\Sec
                 return true;
             }
 
-            return $this->dispatch(new CheckUser($user));
+            return dispatch_sync(new CheckUser($user));
         }
 
     }
@@ -145,7 +145,7 @@ The primary task of any security check is to validate a user. In this example we
             return true;
         }
 
-        return $this->dispatch(new CheckUser($user));
+        return dispatch_sync(new CheckUser($user));
     }
 
 Our `CheckUser` command is responsible for the actual work:

migrations/2019_01_10_202632_anomaly.module.users__add_str_id_to_users.php

@@ -60,8 +60,8 @@ public function up()
          * Ensure the potentially newly generated
          * models are autoloaded so we can use them.
          */
-        $this->dispatchNow(new AutoloadEntryModels());
-        
+        dispatch_sync(new AutoloadEntryModels());
+
         /**
          * Load the concrete on purpose.
          *

src/Http/Controller/RegisterController.php

@@ -37,7 +37,7 @@ public function register(Translator $translator)
      */
     public function activate()
     {
-        if (!$this->dispatch(new HandleActivateRequest())) {
+        if (!dispatch_sync(new HandleActivateRequest())) {
 
             $this->messages->error('anomaly.module.users::error.activate_user');
 

src/User/Command/SendActivationEmail.php

@@ -2,15 +2,9 @@
 
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Notification\ActivateYourAccount;
-use Illuminate\Contracts\Config\Repository;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Mail\Mailer;
-use Illuminate\Mail\Message;
 
 class SendActivationEmail
 {
-    use DispatchesJobs;
-
     /**
      * The user instance.
      *

src/User/Command/SendUserRegisteredEmail.php

@@ -2,7 +2,6 @@
 
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Notification\ActivateYourAccount;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
  * Class SendUserRegisteredEmail
@@ -13,9 +12,6 @@
  */
 class SendUserRegisteredEmail
 {
-
-    use DispatchesJobs;
-
     /**
      * The user instance.
      *

src/User/Notification/ActivateYourAccount.php

@@ -56,6 +56,10 @@ public function toMail(UserInterface $notifiable)
     {
         $data = $notifiable->toArray();
 
+        if (isset($data['roles'])) {
+            unset($data['roles']);
+        }
+
         return (new MailMessage())
             ->view('anomaly.module.users::notifications.activate_your_account')
             ->subject(trans('anomaly.module.users::notification.activate_your_account.subject', $data))

src/User/Notification/PasswordInvalidated.php

@@ -56,6 +56,10 @@ public function toMail(UserInterface $notifiable)
     {
         $data = $notifiable->toArray();
 
+        if (isset($data['roles'])) {
+            unset($data['roles']);
+        }
+
         return (new MailMessage())
             ->error()
             ->view('anomaly.module.users::notifications.password_invalidated')

src/User/Notification/ResetYourPassword.php

@@ -55,6 +55,10 @@ public function via(UserInterface $notifiable)
     public function toMail(UserInterface $notifiable)
     {
         $data = $notifiable->toArray();
+        
+        if (isset($data['roles'])) {
+            unset($data['roles']);
+        }
 
         return (new MailMessage())
             ->error()

src/User/Notification/UserHasBeenActivated.php

@@ -39,6 +39,10 @@ public function toMail(UserInterface $notifiable)
     {
         $data = $notifiable->toArray();
 
+        if (isset($data['roles'])) {
+            unset($data['roles']);
+        }
+
         return (new MailMessage())
             ->view('anomaly.module.users::notifications.user_has_been_activated')
             ->subject(trans('anomaly.module.users::notification.user_has_been_activated.subject', $data))