[13.x] Add ability to default queue by class type

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -18,6 +18,7 @@
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcherContract;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Foundation\CachesRoutes;
+use Illuminate\Support\Queue\Concerns\ResolvesQueueRoutes;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 use Pusher\Pusher;
@@ -29,6 +30,8 @@
  */
 class BroadcastManager implements FactoryContract
 {
+    use ResolvesQueueRoutes;
+
     /**
      * The application instance.
      *
@@ -199,6 +202,10 @@ public function queue($event)
             $queue = $event->queue;
         }
 
+        if (is_null($queue)) {
+            $queue = $this->resolveQueueFromQueueRoute($event) ?? null;
+        }
+
         $broadcastEvent = new BroadcastEvent(clone $event);
 
         if ($event instanceof ShouldBeUnique) {
@@ -210,7 +217,11 @@ public function queue($event)
         }
 
         $push = fn () => $this->app->make('queue')
-            ->connection($event->connection ?? null)
+            ->connection(
+                $event->connection
+                    ?? $this->resolveConnectionFromQueueRoute($event)
+                    ?? null
+            )
             ->pushOn($queue, $broadcastEvent);
 
         $event instanceof ShouldRescue

src/Illuminate/Bus/Dispatcher.php

@@ -12,10 +12,13 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Jobs\SyncJob;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Queue\Concerns\ResolvesQueueRoutes;
 use RuntimeException;
 
 class Dispatcher implements QueueingDispatcher
 {
+    use ResolvesQueueRoutes;
+
     /**
      * The container implementation.
      *
@@ -215,7 +218,9 @@ protected function commandShouldBeQueued($command)
      */
     public function dispatchToQueue($command)
     {
-        $connection = $command->connection ?? null;
+        $connection = $command->connection
+            ?? $this->resolveConnectionFromQueueRoute($command)
+            ?? null;
 
         $queue = ($this->queueResolver)($connection);
 
@@ -239,11 +244,13 @@ public function dispatchToQueue($command)
      */
     protected function pushCommandToQueue($queue, $command)
     {
+        $queueName = $command->queue ?? $this->resolveQueueFromQueueRoute($command) ?? null;
+
         if (isset($command->delay)) {
-            return $queue->later($command->delay, $command, queue: $command->queue ?? null);
+            return $queue->later($command->delay, $command, queue: $queueName);
         }
 
-        return $queue->push($command, queue: $command->queue ?? null);
+        return $queue->push($command, queue: $queueName);
     }
 
     /**

src/Illuminate/Events/Dispatcher.php

@@ -16,6 +16,7 @@
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Queue\Concerns\ResolvesQueueRoutes;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\Traits\ReflectsClosures;
@@ -25,7 +26,7 @@
 
 class Dispatcher implements DispatcherContract
 {
-    use Macroable, ReflectsClosures;
+    use Macroable, ReflectsClosures, ResolvesQueueRoutes;
 
     /**
      * The IoC container instance.
@@ -647,9 +648,13 @@ protected function queueHandler($class, $method, $arguments)
     {
         [$listener, $job] = $this->createListenerAndJob($class, $method, $arguments);
 
-        $connection = $this->resolveQueue()->connection(method_exists($listener, 'viaConnection')
+        $connectionName = method_exists($listener, 'viaConnection')
             ? (isset($arguments[0]) ? $listener->viaConnection($arguments[0]) : $listener->viaConnection())
-            : $listener->connection ?? null);
+            : $listener->connection ?? null;
+
+        $connection = $this->resolveQueue()->connection(
+            $connectionName ?? $this->resolveConnectionFromQueueRoute($listener) ?? null
+        );
 
         $queue = method_exists($listener, 'viaQueue')
             ? (isset($arguments[0]) ? $listener->viaQueue($arguments[0]) : $listener->viaQueue())
@@ -659,6 +664,10 @@ protected function queueHandler($class, $method, $arguments)
             ? (isset($arguments[0]) ? $listener->withDelay($arguments[0]) : $listener->withDelay())
             : $listener->delay ?? null;
 
+        if (is_null($queue)) {
+            $queue = $this->resolveQueueFromQueueRoute($listener) ?? null;
+        }
+
         is_null($delay)
             ? $connection->pushOn(enum_value($queue), $job)
             : $connection->laterOn(enum_value($queue), $delay, $job);

src/Illuminate/Mail/Mailable.php

@@ -230,7 +230,17 @@ public function queue(Queue $queue)
 
         $connection = property_exists($this, 'connection') ? $this->connection : null;
 
-        $queueName = property_exists($this, 'queue') ? $this->queue : null;
+        if (is_null($connection) && method_exists($queue, 'resolveConnectionFromQueueRoute')) {
+            $connection = $queue->resolveConnectionFromQueueRoute($this);
+        }
+
+        $queueName = property_exists($this, 'queue')
+            ? $this->queue
+            : null;
+
+        if (is_null($queueName) && method_exists($queue, 'resolveQueueFromQueueRoute')) {
+            $queueName = $queue->resolveQueueFromQueueRoute($this);
+        }
 
         return $queue->connection($connection)->pushOn(
             $queueName ?: null, $this->newQueuedJob()
@@ -248,7 +258,17 @@ public function later($delay, Queue $queue)
     {
         $connection = property_exists($this, 'connection') ? $this->connection : null;
 
-        $queueName = property_exists($this, 'queue') ? $this->queue : null;
+        $queueName = property_exists($this, 'queue')
+            ? $this->queue
+            : null;
+
+        if (is_null($connection) && method_exists($queue, 'resolveConnectionFromQueueRoute')) {
+            $connection = $queue->resolveConnectionFromQueueRoute($this);
+        }
+
+        if (is_null($queueName) && method_exists($queue, 'resolveQueueFromQueueRoute')) {
+            $queueName = $queue->resolveQueueFromQueueRoute($this);
+        }
 
         return $queue->connection($connection)->laterOn(
             $queueName ?: null, $delay, $this->newQueuedJob()

src/Illuminate/Notifications/ChannelManager.php

@@ -7,10 +7,13 @@
 use Illuminate\Contracts\Notifications\Dispatcher as DispatcherContract;
 use Illuminate\Contracts\Notifications\Factory as FactoryContract;
 use Illuminate\Support\Manager;
+use Illuminate\Support\Queue\Concerns\ResolvesQueueRoutes;
 use InvalidArgumentException;
 
 class ChannelManager extends Manager implements DispatcherContract, FactoryContract
 {
+    use ResolvesQueueRoutes;
+
     /**
      * The default channel used to deliver messages.
      *

src/Illuminate/Notifications/NotificationSender.php

@@ -229,13 +229,17 @@ protected function queueNotification($notifiables, $notification)
                     $notification->locale = $this->locale;
                 }
 
-                $connection = $notification->connection;
+                $connection = $notification->connection
+                    ?? $this->manager->resolveConnectionFromQueueRoute($notification)
+                    ?? null;
 
                 if (method_exists($notification, 'viaConnections')) {
                     $connection = $notification->viaConnections()[$channel] ?? $connection;
                 }
 
-                $queue = $notification->queue;
+                $queue = $notification->queue
+                    ?? $this->manager->resolveQueueFromQueueRoute($notification)
+                    ?? null;
 
                 if (method_exists($notification, 'viaQueues')) {
                     $queue = $notification->viaQueues()[$channel] ?? $queue;

src/Illuminate/Queue/QueueManager.php

@@ -5,13 +5,16 @@
 use Closure;
 use Illuminate\Contracts\Queue\Factory as FactoryContract;
 use Illuminate\Contracts\Queue\Monitor as MonitorContract;
+use Illuminate\Support\Queue\Concerns\ResolvesQueueRoutes;
 use InvalidArgumentException;
 
 /**
  * @mixin \Illuminate\Contracts\Queue\Queue
  */
 class QueueManager implements FactoryContract, MonitorContract
 {
+    use ResolvesQueueRoutes;
+
     /**
      * The application instance.
      *
@@ -120,6 +123,19 @@ public function stopping($callback)
         $this->app['events']->listen(Events\WorkerStopping::class, $callback);
     }
 
+    /**
+     * Set the queue route for the given class.
+     *
+     * @param  array|class-string  $class
+     * @param  string|null  $queue
+     * @param  string|null  $connection
+     * @return void
+     */
+    public function route(array|string $class, $queue = null, $connection = null)
+    {
+        $this->queueRoutes()->set($class, $queue, $connection);
+    }
+
     /**
      * Determine if the driver is connected.
      *

src/Illuminate/Queue/QueueRoutes.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace Illuminate\Queue;
+
+class QueueRoutes
+{
+    /**
+     * The mapping of class names to their default routes.
+     *
+     * @var array<class-string, string>
+     */
+    protected $routes = [];
+
+    /**
+     * Get the queue connection that a given queueable instance should be routed to.
+     *
+     * @param  object  $queueable
+     * @return string|null
+     */
+    public function getConnection($queueable)
+    {
+        $route = $this->getRoute($queueable);
+
+        if (is_null($route)) {
+            return;
+        }
+
+        return is_string($route)
+            ? $route
+            : $route[0];
+    }
+
+    /**
+     * Get the queue that a given queueable instance should be routed to.
+     *
+     * @param  object  $queueable
+     * @return string|null
+     */
+    public function getQueue($queueable)
+    {
+        $route = $this->getRoute($queueable);
+
+        if (is_null($route)) {
+            return;
+        }
+
+        return is_string($route)
+            ? $route
+            : $route[1];
+    }
+
+    /**
+     * Get the queue that a given queueable instance should be routed to.
+     *
+     * @param  object  $queueable
+     * @return string|null
+     */
+    public function getRoute($queueable)
+    {
+        if (empty($this->routes)) {
+            return null;
+        }
+
+        $classes = array_merge(
+            [get_class($queueable)],
+            class_parents($queueable) ?: [],
+            class_implements($queueable) ?: [],
+            class_uses_recursive($queueable)
+        );
+
+        foreach ($classes as $class) {
+            if (isset($this->routes[$class])) {
+                return $this->routes[$class];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Register the queue route for the given class.
+     *
+     * @param  array|class-string  $class
+     * @param  string|null  $queue
+     * @param  string|null  $connection
+     * @return void
+     */
+    public function set(array|string $class, $queue = null, $connection = null)
+    {
+        $routes = is_array($class) ? $class : [$class => [$connection, $queue]];
+
+        foreach ($routes as $from => $to) {
+            $this->routes[$from] = $to;
+        }
+    }
+
+    /**
+     * Get all registered queue routes.
+     *
+     * @return array
+     */
+    public function all()
+    {
+        return $this->routes;
+    }
+}

src/Illuminate/Queue/QueueServiceProvider.php

@@ -42,6 +42,7 @@ public function register()
         $this->registerConnection();
         $this->registerWorker();
         $this->registerListener();
+        $this->registerRoutes();
         $this->registerFailedJobServices();
     }
 
@@ -288,6 +289,18 @@ protected function registerListener()
         });
     }
 
+    /**
+     * Register the default queue routes binding.
+     *
+     * @return void
+     */
+    protected function registerRoutes()
+    {
+        $this->app->singleton('queue.routes', function () {
+            return new QueueRoutes;
+        });
+    }
+
     /**
      * Register the failed job services.
      *
@@ -388,6 +401,7 @@ public function provides()
             'queue.connection',
             'queue.failer',
             'queue.listener',
+            'queue.routes',
             'queue.worker',
         ];
     }