Fix dispatcher not registering when db is already resolved (#24)

fntneves · Aug 19, 2019 · aa41f4e · aa41f4e
1 parent e1a9277
commit aa41f4e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Neves/Events/EventServiceProvider.php b/src/Neves/Events/EventServiceProvider.php
@@ -23,7 +23,7 @@ public function register()
             return;
         }
 
-        $this->app->afterResolving('db', function ($connectionResolver) {
+        $resolver = function () {
             $eventDispatcher = $this->app->make(EventDispatcher::class);
             $this->app->extend('events', function () use ($eventDispatcher) {
                 $dispatcher = new TransactionalDispatcher($eventDispatcher);
@@ -32,7 +32,13 @@ public function register()
 
                 return $dispatcher;
             });
-        });
+        };
+
+        if ($this->app->resolved('db')) {
+            $resolver();
+        } else {
+            $this->app->afterResolving('db', $resolver);
+        }
     }
 
     /**