Merge pull request #3 from anomalylabs/2.6

Sync

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))

src/User/Notification/UserHasRegistered.php

@@ -45,7 +45,7 @@ public function __construct(UserInterface $user)
      */
     public function via()
     {
-        return ['mail', 'slack'];
+        return ['mail'];
     }
 
     /**
@@ -58,6 +58,10 @@ public function toMail(AnonymousNotifiable $notifiable)
     {
         $data = $this->user->toArray();
 
+        if (isset($data['roles'])) {
+            unset($data['roles']);
+        }
+
         return (new MailMessage())
             ->view('anomaly.module.users::notifications.user_has_registered')
             ->subject(trans('anomaly.module.users::notification.user_has_registered.subject', $data))

src/User/Notification/UserPendingActivation.php

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

src/User/Password/Command/SendInvalidatedEmail.php

@@ -2,7 +2,6 @@
 
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Notification\PasswordInvalidated;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Notifications\Notifiable;
 
 /**
@@ -14,9 +13,6 @@
  */
 class SendInvalidatedEmail
 {
-
-    use DispatchesJobs;
-
     /**
      * The user instance.
      *

src/User/Password/Command/SendResetEmail.php

@@ -2,7 +2,6 @@
 
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Notification\ResetYourPassword;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Notifications\Notifiable;
 
 /**
@@ -14,9 +13,6 @@
  */
 class SendResetEmail
 {
-
-    use DispatchesJobs;
-
     /**
      * The user instance.
      *

src/User/Register/Command/AssociateActivationRoles.php

@@ -2,7 +2,6 @@
 
 use Anomaly\UsersModule\Role\Command\GetRole;
 use Anomaly\UsersModule\User\Register\RegisterFormBuilder;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
  * Class AssociateActivationRoles
@@ -13,9 +12,6 @@
  */
 class AssociateActivationRoles
 {
-
-    use DispatchesJobs;
-
     /**
      * The form builder.
      *
@@ -42,7 +38,7 @@ public function handle()
         $user = $this->builder->getFormEntry();
 
         foreach ($this->builder->getRoles() as $role) {
-            if ($role = $this->dispatch(new GetRole($role))) {
+            if ($role = dispatch_sync(new GetRole($role))) {
                 $user->attachRole($role);
             }
         }

src/User/Register/RegisterFormBuilder.php

@@ -89,7 +89,7 @@ class RegisterFormBuilder extends FormBuilder
      */
     public function onSaved()
     {
-        $this->dispatch(new AssociateActivationRoles($this));
+        dispatch_sync(new AssociateActivationRoles($this));
     }
 
     /**

src/User/Register/RegisterFormHandler.php

@@ -43,15 +43,15 @@ public function handle(
 
         switch ($mode) {
             case 'automatic':
-                dispatch_now(new HandleAutomaticRegistration($builder));
+                dispatch_sync(new HandleAutomaticRegistration($builder));
                 break;
 
             case 'manual':
-                dispatch_now(new HandleManualRegistration($builder));
+                dispatch_sync(new HandleManualRegistration($builder));
                 break;
 
             case 'email':
-                dispatch_now(new HandleEmailRegistration($builder));
+                dispatch_sync(new HandleEmailRegistration($builder));
                 break;
         }
 

src/User/UserActivator.php

@@ -5,12 +5,9 @@
 use Anomaly\UsersModule\User\Command\SendActivationEmail;
 use Anomaly\UsersModule\User\Command\StartUserActivation;
 use Anomaly\UsersModule\User\Contract\UserInterface;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 class UserActivator
 {
-    use DispatchesJobs;
-
     /**
      * Start a user activation process.
      *
@@ -19,7 +16,7 @@ class UserActivator
      */
     public function start(UserInterface $user)
     {
-        return $this->dispatch(new StartUserActivation($user));
+        return dispatch_sync(new StartUserActivation($user));
     }
 
     /**
@@ -31,7 +28,7 @@ public function start(UserInterface $user)
      */
     public function activate(UserInterface $user, $code)
     {
-        return $this->dispatch(new ActivateUserByCode($user, $code));
+        return dispatch_sync(new ActivateUserByCode($user, $code));
     }
 
     /**
@@ -42,7 +39,7 @@ public function activate(UserInterface $user, $code)
      */
     public function force(UserInterface $user)
     {
-        return $this->dispatch(new ActivateUserByForce($user));
+        return dispatch_sync(new ActivateUserByForce($user));
     }
 
     /**
@@ -54,6 +51,6 @@ public function force(UserInterface $user)
      */
     public function send(UserInterface $user, $redirect = '/')
     {
-        return $this->dispatch(new SendActivationEmail($user, $redirect));
+        return dispatch_sync(new SendActivationEmail($user, $redirect));
     }
 }

src/User/UserModel.php

@@ -127,7 +127,7 @@ public function getRoles()
     public function hasRole($role)
     {
         if (!is_object($role)) {
-            $role = $this->dispatch(new GetRole($role));
+            $role = dispatch_sync(new GetRole($role));
         }
 
         if (!$role) {

src/User/UserObserver.php

@@ -25,7 +25,7 @@ class UserObserver extends EntryObserver
      */
     public function creating(EntryInterface $entry)
     {
-        $this->dispatchNow(new SetStrId($entry));
+        dispatch_sync(new SetStrId($entry));
 
         parent::creating($entry);
     }

src/User/UserPassword.php

@@ -7,7 +7,6 @@
 use Anomaly\UsersModule\User\Password\Command\SendInvalidatedEmail;
 use Anomaly\UsersModule\User\Password\Command\SendResetEmail;
 use Anomaly\UsersModule\User\Password\Command\StartPasswordReset;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
  * Class UserPassword
@@ -18,9 +17,6 @@
  */
 class UserPassword
 {
-
-    use DispatchesJobs;
-
     /**
      * Check if the password passes validation.
      *
@@ -40,7 +36,7 @@ public function passes($password)
      */
     public function validate($password)
     {
-        return $this->dispatch(new ValidatePasswordStrength($password));
+        return dispatch_sync(new ValidatePasswordStrength($password));
     }
 
     /**
@@ -51,7 +47,7 @@ public function validate($password)
      */
     public function forgot(UserInterface $user)
     {
-        return $this->dispatch(new StartPasswordReset($user));
+        return dispatch_sync(new StartPasswordReset($user));
     }
 
     /**
@@ -64,7 +60,7 @@ public function forgot(UserInterface $user)
      */
     public function reset(UserInterface $user, $code, $password)
     {
-        return $this->dispatch(new ResetPassword($user, $code, $password));
+        return dispatch_sync(new ResetPassword($user, $code, $password));
     }
 
     /**
@@ -76,7 +72,7 @@ public function reset(UserInterface $user, $code, $password)
      */
     public function send(UserInterface $user, $reset = '/')
     {
-        return $this->dispatch(new SendResetEmail($user, $reset));
+        return dispatch_sync(new SendResetEmail($user, $reset));
     }
 
     /**
@@ -89,9 +85,9 @@ public function send(UserInterface $user, $reset = '/')
     public function invalidate(UserInterface $user, $reset = '/')
     {
         $this->forgot($user);
-        $this->dispatch(new InvalidatePassword($user));
+        dispatch_sync(new InvalidatePassword($user));
 
-        return $this->dispatch(new SendInvalidatedEmail($user, $reset));
+        return dispatch_sync(new SendInvalidatedEmail($user, $reset));
     }
 
 }

src/UsersModule.php

@@ -53,7 +53,7 @@ class UsersModule extends Module
     public function onRegistered()
     {
         if ($this->isInstalled()) {
-            $this->dispatch(new SetGuestRole());
+            dispatch_sync(new SetGuestRole());
         }
     }