Use event helper for BC for Laravel 5.0 to 5.8

#676

Author: harrygulliford

src/Auth/DatabaseUserProvider.php

@@ -12,7 +12,6 @@
 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\Hashing\Hasher;
@@ -104,7 +103,7 @@ public function retrieveByCredentials(array $credentials)
             // Set the currently authenticating LDAP user.
             $this->user = $user;
 
-            Event::fire(new DiscoveredWithCredentials($user));
+            event(new DiscoveredWithCredentials($user));
 
             // Import / locate the local user account.
             return Bus::dispatch(
@@ -126,7 +125,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::fire(new AuthenticatedWithCredentials($this->user, $model));
+                event(new AuthenticatedWithCredentials($this->user, $model));
 
                 // Here we will perform authorization on the LDAP user. If all
                 // validation rules pass, we will allow the authentication
@@ -142,15 +141,15 @@ public function validateCredentials(Authenticatable $model, array $credentials)
                     if ($model->wasRecentlyCreated) {
                         // If the model was recently created, they
                         // have been imported successfully.
-                        Event::fire(new Imported($this->user, $model));
+                        event(new Imported($this->user, $model));
                     }
 
-                    Event::fire(new AuthenticationSuccessful($this->user, $model));
+                    event(new AuthenticationSuccessful($this->user, $model));
 
                     return true;
                 }
 
-                Event::fire(new AuthenticationRejected($this->user, $model));
+                event(new AuthenticationRejected($this->user, $model));
             }
 
             // LDAP Authentication failed.

src/Auth/NoDatabaseUserProvider.php

@@ -7,7 +7,6 @@
 use Adldap\Laravel\Events\AuthenticationSuccessful;
 use Adldap\Laravel\Events\DiscoveredWithCredentials;
 use Adldap\Laravel\Events\AuthenticatedWithCredentials;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Contracts\Auth\Authenticatable;
 
 class NoDatabaseUserProvider extends Provider
@@ -46,7 +45,7 @@ public function updateRememberToken(Authenticatable $user, $token)
     public function retrieveByCredentials(array $credentials)
     {
         if ($user = Resolver::byCredentials($credentials)) {
-            Event::fire(new DiscoveredWithCredentials($user));
+            event(new DiscoveredWithCredentials($user));
 
             return $user;
         }
@@ -58,15 +57,15 @@ public function retrieveByCredentials(array $credentials)
     public function validateCredentials(Authenticatable $user, array $credentials)
     {
         if (Resolver::authenticate($user, $credentials)) {
-            Event::fire(new AuthenticatedWithCredentials($user));
+            event(new AuthenticatedWithCredentials($user));
 
             if ($this->passesValidation($user)) {
-                Event::fire(new AuthenticationSuccessful($user));
+                event(new AuthenticationSuccessful($user));
 
                 return true;
             }
 
-            Event::fire(new AuthenticationRejected($user));
+            event(new AuthenticationRejected($user));
         }
 
         return false;

src/Commands/Console/Import.php

@@ -11,7 +11,6 @@
 use Adldap\Laravel\Commands\Import as ImportUser;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Eloquent\Model;
 
@@ -254,7 +253,7 @@ protected function save(User $user, Model $model) : bool
         if ($model->save() && $model->wasRecentlyCreated) {
             $imported = true;
 
-            Event::fire(new Imported($user, $model));
+            event(new Imported($user, $model));
 
             // Log the successful import.
             if ($this->isLogging()) {

src/Commands/Import.php

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

src/Middleware/WindowsAuthenticate.php

@@ -13,7 +13,6 @@
 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
@@ -112,7 +111,7 @@ protected function retrieveAuthenticatedUser($username)
      */
     protected function fireAuthenticatedEvent(User $user, $model = null)
     {
-        Event::fire(new AuthenticatedWithWindows($user, $model));
+        event(new AuthenticatedWithWindows($user, $model));
     }
 
     /**

src/Resolvers/UserResolver.php

@@ -11,7 +11,6 @@
 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;
@@ -111,15 +110,15 @@ public function authenticate(User $user, array $credentials = [])
 
         $password = $this->getPasswordFromCredentials($credentials);
 
-        Event::fire(new Authenticating($user, $username));
+        event(new Authenticating($user, $username));
 
         if ($this->getLdapAuthProvider()->auth()->attempt($username, $password)) {
-            Event::fire(new Authenticated($user));
+            event(new Authenticated($user));
 
             return true;
         }
 
-        Event::fire(new AuthenticationFailed($user));
+        event(new AuthenticationFailed($user));
 
         return false;
     }

src/Validation/Rules/DenyTrashed.php

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