introduce OnQueue and OnConnection

Author: cosmastech

src/Illuminate/Foundation/Bus/Attributes/OnConnection.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Illuminate\Foundation\Bus\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class OnConnection
+{
+    /**
+     * @param  string|\BackedEnum $connection
+     * @return void
+     */
+    public function __construct(public $connection)
+    {
+    }
+}

src/Illuminate/Foundation/Bus/Attributes/OnQueue.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Illuminate\Foundation\Bus\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class OnQueue
+{
+    /**
+     * @param  string|\BackedEnum $queue
+     * @return void
+     */
+    public function __construct(public $queue)
+    {
+
+    }
+}

src/Illuminate/Foundation/Bus/PendingDispatch.php

@@ -7,6 +7,8 @@
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Foundation\Bus\Attributes\OnConnection;
+use Illuminate\Foundation\Bus\Attributes\OnQueue;
 
 class PendingDispatch
 {
@@ -33,6 +35,31 @@ class PendingDispatch
     public function __construct($job)
     {
         $this->job = $job;
+
+        $this->setQueueAndConnectionFromAttributesIfNotSet();
+    }
+
+    protected function setQueueAndConnectionFromAttributesIfNotSet(): void
+    {
+        if (($hasQueueSet = isset($this->job->queue))
+            && ($hasConnectionSet = isset($this->job->connection))) {
+            return;
+        }
+
+        $reflectionClass = new \ReflectionClass($this->job);
+        if (!$hasQueueSet) {
+            $onQueue = $reflectionClass->getAttributes(OnQueue::class);
+            if ($onQueue !== []) {
+                $this->onQueue($onQueue[0]->newInstance()->queue);
+            }
+        }
+
+        if (!$hasConnectionSet) {
+            $onConnection = $reflectionClass->getAttributes(OnConnection::class);
+            if ($onConnection !== []) {
+                $this->onConnection($onConnection[0]->newInstance()->connection);
+            }
+        }
     }
 
     /**

tests/Bus/BusPendingDispatchWithAttributesTest.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace Illuminate\Tests\Bus;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Attributes\OnConnection;
+use Illuminate\Foundation\Bus\Attributes\OnQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Queue;
+use Orchestra\Testbench\TestCase;
+
+class BusPendingDispatchWithAttributesTest extends TestCase
+{
+    public function testDispatchWhereQueueAndConnectionAreFromAttributes(): void
+    {
+        Queue::fake();
+        FakeJobWithOnQueueAndOnConnection::dispatch(123);
+
+        Queue::assertPushed(function (FakeJobWithOnQueueAndOnConnection $job) {
+            return $job->connection === "connection_from_attribute"
+                && $job->queue === "queue-from-attribute"
+                && $job->value === 123;
+        });
+    }
+
+    public function testDispatchWhereQueueIsFromAttribute(): void
+    {
+        Queue::fake();
+
+        FakeJobWithOnQueueFromAttribute::dispatch(1234)->onConnection("not-from-attribute");
+
+        Queue::assertPushed(function (FakeJobWithOnQueueFromAttribute $job) {
+            return $job->connection === "not-from-attribute"
+                && $job->queue === "queue-from-attribute"
+                && $job->value === 1234;
+        });
+    }
+
+    public function testDispatchWhereConnectionIsFromAttribute(): void
+    {
+        Queue::fake();
+
+        FakeJobWithOnConnection::dispatch(999);
+
+        Queue::assertPushed(function (FakeJobWithOnConnection $job) {
+            return $job->connection === "connection_from_attribute"
+                && !isset($job->queue)
+                && $job->value === 999;
+        });
+    }
+
+    public function testOverridingQueueAndConnectionDoesNotUseAttributeValues(): void
+    {
+        Queue::fake();
+
+        FakeJobWithOnQueueAndOnConnection::dispatch('abc')
+            ->onQueue('setViaMethod')
+            ->onConnection('setViaMethodToo');
+
+        Queue::assertPushed(function (FakeJobWithOnQueueAndOnConnection $job) {
+            return $job->queue === "setViaMethod"
+                && $job->connection === "setViaMethodToo"
+                && $job->value === 'abc';
+        });
+    }
+}
+
+#[OnQueue('queue-from-attribute')]
+#[OnConnection('connection_from_attribute')]
+class FakeJobWithOnQueueAndOnConnection implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use InteractsWithQueue;
+
+    public function __construct(public $value)
+    {
+    }
+}
+
+#[OnQueue('queue-from-attribute')]
+class FakeJobWithOnQueueFromAttribute implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use InteractsWithQueue;
+
+    public function __construct(public $value)
+    {
+    }
+}
+
+#[OnConnection('connection_from_attribute')]
+class FakeJobWithOnConnection implements ShouldQueue
+{
+    use Dispatchable;
+    use Queueable;
+    use InteractsWithQueue;
+
+    public function __construct(public $value)
+    {
+    }
+}