Only register logging listeners when logging is enabled

Author: stevebauman

src/LdapServiceProvider.php

@@ -30,7 +30,6 @@ public function boot(): void
         $this->registerLogging();
         $this->registerCommands();
         $this->registerConfiguration();
-        $this->registerEventListeners();
         $this->registerLdapConnections();
 
         if ($this->app->runningUnitTests()) {
@@ -84,6 +83,14 @@ protected function registerLogging(): void
                 Config::get('ldap.logging.channel')
             )
         );
+
+        Event::listen('LdapRecord\Laravel\Events\*', function ($eventName, array $events) {
+            collect($events)->filter(function ($event) {
+                return $event instanceof LoggableEvent && $event->shouldLogEvent();
+            })->each(function (LoggableEvent $event) {
+                Log::log($event->getLogLevel(), $event->getLogMessage());
+            });
+        });
     }
 
     /**
@@ -114,20 +121,6 @@ protected function registerConfiguredConnections(): void
         }
     }
 
-    /**
-     * Registers the LDAP event listeners.
-     */
-    protected function registerEventListeners(): void
-    {
-        Event::listen('LdapRecord\Laravel\Events\*', function ($eventName, array $events) {
-            collect($events)->filter(function ($event) {
-                return $event instanceof LoggableEvent && $event->shouldLogEvent();
-            })->each(function (LoggableEvent $event) {
-                Log::log($event->getLogLevel(), $event->getLogMessage());
-            });
-        });
-    }
-
     /**
      * Register the connections that exist in the environment file.
      */

tests/Feature/LdapUserSynchronizerTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Hash;
+use LdapRecord\Container;
 use LdapRecord\Laravel\Events\Import\Importing;
 use LdapRecord\Laravel\Events\Import\Synchronized;
 use LdapRecord\Laravel\Events\Import\Synchronizing;
@@ -17,6 +18,7 @@ class LdapUserSynchronizerTest extends DatabaseUserProviderTest
 
     public function test_eloquent_model_can_be_set()
     {
+        ray(Container::getInstance());
         $synchronizer = new UserSynchronizer(TestUserModelStub::class, []);
 
         $this->assertSame(TestUserModelStub::class, $synchronizer->getEloquentModel());
@@ -25,6 +27,7 @@ public function test_eloquent_model_can_be_set()
 
     public function test_config_can_be_set()
     {
+        ray(Container::getInstance());
         $synchronizer = new UserSynchronizer(TestUserModelStub::class, []);
 
         $config = ['foo' => 'bar'];
@@ -36,6 +39,7 @@ public function test_config_can_be_set()
 
     public function test_new_ldap_user_has_guid_and_domain_set()
     {
+        ray(Container::getInstance());
         Event::fake();
 
         $ldapModel = $this->getMockLdapModel();
@@ -80,6 +84,7 @@ public function test_new_ldap_user_has_attributes_synchronized()
 
     public function test_new_ldap_user_has_attributes_synchronized_via_handler()
     {
+        ray(Container::getInstance());
         Event::fake();
 
         $ldapModel = $this->getMockLdapModel(['cn' => 'john', 'mail' => '[email protected]']);
@@ -132,6 +137,7 @@ public function test_ldap_sync_attributes_can_be_string()
 
     public function test_password_is_synchronized_when_enabled()
     {
+        ray(Container::getInstance());
         Event::fake();
 
         $ldapModel = $this->getMockLdapModel();