From d44ed21525a9bf1a12717c92318e9dcd3a1427d1 Mon Sep 17 00:00:00 2001
From: Mohamed Said <themohamedsaid@gmail.com>
Date: Tue, 29 Dec 2020 17:18:15 +0200
Subject: [PATCH] [8.x] Set chain queue when inside a batch (#35746)

* set chain copnnection when inside a batch

* set chain connection from batch
---
 src/Illuminate/Bus/Batch.php | 5 ++++-
 tests/Bus/BusBatchTest.php   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Bus/Batch.php b/src/Illuminate/Bus/Batch.php
index 1073ecd46d37..cac16e1e9f51 100644
--- a/src/Illuminate/Bus/Batch.php
+++ b/src/Illuminate/Bus/Batch.php
@@ -170,7 +170,10 @@ public function add($jobs)
                 $count += count($job);
 
                 return with($this->prepareBatchedChain($job), function ($chain) {
-                    return $chain->first()->chain($chain->slice(1)->values()->all());
+                    return $chain->first()
+                            ->allOnQueue($this->options['queue'] ?? null)
+                            ->allOnConnection($this->options['connection'] ?? null)
+                            ->chain($chain->slice(1)->values()->all());
                 });
             } else {
                 $job->withBatchId($this->id);
diff --git a/tests/Bus/BusBatchTest.php b/tests/Bus/BusBatchTest.php
index 381200daa171..8f4d6c5a11d4 100644
--- a/tests/Bus/BusBatchTest.php
+++ b/tests/Bus/BusBatchTest.php
@@ -332,6 +332,7 @@ public function test_chain_can_be_added_to_batch()
 
         $this->assertEquals(3, $batch->totalJobs);
         $this->assertEquals(3, $batch->pendingJobs);
+        $this->assertEquals('test-queue', $chainHeadJob->chainQueue);
         $this->assertTrue(is_string($chainHeadJob->batchId));
         $this->assertTrue(is_string($secondJob->batchId));
         $this->assertTrue(is_string($thirdJob->batchId));