Use Event facade for dispatching events

Author: stevebauman

src/Auth/DatabaseUserProvider.php

@@ -13,6 +13,7 @@
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
 use Adldap\Laravel\Events\AuthenticatedWithCredentials;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Auth\EloquentUserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -40,7 +41,7 @@ public function retrieveByCredentials(array $credentials)
             // Set the currently authenticating LDAP user.
             $this->user = $user;
 
-            event(new DiscoveredWithCredentials($user));
+            Event::dispatch(new DiscoveredWithCredentials($user));
 
             // Import / locate the local user account.
             return Bus::dispatch(
@@ -62,7 +63,7 @@ public function validateCredentials(Authenticatable $model, array $credentials)
             // If an LDAP user was discovered, we can go
             // ahead and try to authenticate them.
             if (Resolver::authenticate($this->user, $credentials)) {
-                event(new AuthenticatedWithCredentials($this->user, $model));
+                Event::dispatch(new AuthenticatedWithCredentials($this->user, $model));
 
                 // Here we will perform authorization on the LDAP user. If all
                 // validation rules pass, we will allow the authentication
@@ -78,15 +79,15 @@ public function validateCredentials(Authenticatable $model, array $credentials)
                     if ($model->wasRecentlyCreated) {
                         // If the model was recently created, they
                         // have been imported successfully.
-                        event(new Imported($this->user, $model));
+                        Event::dispatch(new Imported($this->user, $model));
                     }
 
-                    event(new AuthenticationSuccessful($this->user, $model));
+                    Event::dispatch(new AuthenticationSuccessful($this->user, $model));
 
                     return true;
                 }
 
-                event(new AuthenticationRejected($this->user, $model));
+                Event::dispatch(new AuthenticationRejected($this->user, $model));
             }
 
             // LDAP Authentication failed.

src/Auth/NoDatabaseUserProvider.php

@@ -8,6 +8,7 @@
 use Adldap\Laravel\Events\AuthenticationSuccessful;
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
 use Adldap\Laravel\Events\AuthenticatedWithCredentials;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
 
@@ -49,7 +50,7 @@ public function updateRememberToken(Authenticatable $user, $token)
     public function retrieveByCredentials(array $credentials)
     {
         if ($user = Resolver::byCredentials($credentials)) {
-            event(new DiscoveredWithCredentials($user));
+            Event::dispatch(new DiscoveredWithCredentials($user));
 
             return $user;
         }
@@ -61,15 +62,15 @@ public function retrieveByCredentials(array $credentials)
     public function validateCredentials(Authenticatable $user, array $credentials)
     {
         if (Resolver::authenticate($user, $credentials)) {
-            event(new AuthenticatedWithCredentials($user));
+            Event::dispatch(new AuthenticatedWithCredentials($user));
 
             if ($this->passesValidation($user)) {
-                event(new AuthenticationSuccessful($user));
+                Event::dispatch(new AuthenticationSuccessful($user));
 
                 return true;
             }
 
-            event(new AuthenticationRejected($user));
+            Event::dispatch(new AuthenticationRejected($user));
         }
 
         return false;

src/Commands/Import.php

@@ -7,6 +7,7 @@
 use Adldap\Laravel\Events\Importing;
 use Adldap\Laravel\Events\Synchronized;
 use Adldap\Laravel\Events\Synchronizing;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
 
@@ -51,14 +52,14 @@ public function handle()
         $model = $this->findUser() ?: $this->model->newInstance();
 
         if (! $model->exists) {
-            event(new Importing($this->user, $model));
+            Event::dispatch(new Importing($this->user, $model));
         }
 
-        event(new Synchronizing($this->user, $model));
+        Event::dispatch(new Synchronizing($this->user, $model));
 
         $this->sync($model);
 
-        event(new Synchronized($this->user, $model));
+        Event::dispatch(new Synchronized($this->user, $model));
 
         return $model;
     }

src/Middleware/WindowsAuthenticate.php

@@ -13,6 +13,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
 
 class WindowsAuthenticate
@@ -109,7 +110,7 @@ protected function retrieveAuthenticatedUser($username)
      */
     protected function fireAuthenticatedEvent(User $user, $model = null)
     {
-        event(new AuthenticatedWithWindows($user, $model));
+        Event::dispatch(new AuthenticatedWithWindows($user, $model));
     }
 
     /**

src/Resolvers/UserResolver.php

@@ -12,6 +12,7 @@
 use Adldap\Laravel\Events\AuthenticationFailed;
 use Adldap\Laravel\Auth\NoDatabaseUserProvider;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -112,15 +113,15 @@ public function authenticate(User $user, array $credentials = [])
 
         $password = $this->getPasswordFromCredentials($credentials);
 
-        event(new Authenticating($user, $username));
+        Event::dispatch(new Authenticating($user, $username));
 
         if ($this->getLdapAuthProvider()->auth()->attempt($username, $password)) {
-            event(new Authenticated($user));
+            Event::dispatch(new Authenticated($user));
 
             return true;
         }
 
-        event(new AuthenticationFailed($user));
+        Event::dispatch(new AuthenticationFailed($user));
 
         return false;
     }

src/Validation/Rules/DenyTrashed.php

@@ -2,6 +2,7 @@
 
 namespace Adldap\Laravel\Validation\Rules;
 
+use Illuminate\Support\Facades\Event;
 use Adldap\Laravel\Events\AuthenticatedModelTrashed;
 
 class DenyTrashed extends Rule
@@ -12,7 +13,7 @@ class DenyTrashed extends Rule
     public function isValid()
     {
         if ($this->isTrashed()) {
-            event(
+            Event::dispatch(
                 new AuthenticatedModelTrashed($this->user, $this->model)
             );