Fixes support with Laravel 10.30

octobercms · Dec 6, 2023 · 0c755d8 · 0c755d8
1 parent addf4fc
commit 0c755d8
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/src/Events/EventServiceProvider.php b/src/Events/EventServiceProvider.php
@@ -18,9 +18,30 @@ class EventServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('events', function ($app) {
-            return (new Dispatcher($app))->setQueueResolver(function () use ($app) {
+            // return (new Dispatcher($app))->setQueueResolver(function () use ($app) {
+            //     return $app->make(QueueFactoryContract::class);
+            // })->setTransactionManagerResolver(function () use ($app) {
+            //     return $app->bound('db.transactions')
+            //         ? $app->make('db.transactions')
+            //         : null;
+            // });
+
+            // The following adds support for Laravel 10.30 when a transaction manager resolver
+            // was included as part of the dispatcher. Detect its presence and set it as needed
+            // @deprecated remove reflection and use code above in v4 (Laravel 11)
+            $dispatcher = (new Dispatcher($app))->setQueueResolver(function () use ($app) {
                 return $app->make(QueueFactoryContract::class);
             });
+
+            if (method_exists($dispatcher, 'setTransactionManagerResolver')) {
+                $dispatcher->setTransactionManagerResolver(function () use ($app) {
+                    return $app->bound('db.transactions')
+                        ? $app->make('db.transactions')
+                        : null;
+                });
+            }
+
+            return $dispatcher;
         });
 
         $this->app->singleton('events.priority', function ($app) {