Run prepareNestedBatches on append/prependToChain & chain (#52486)

* Run prepareNestedBatches on append/prependToChain * Cleanup leftover import * Update chain method * Update Queueable.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Aug 15, 2024 · 0b3d2aa · 0b3d2aa
1 parent 85165d7
commit 0b3d2aa
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Illuminate/Bus/Queueable.php b/src/Illuminate/Bus/Queueable.php
@@ -197,7 +197,9 @@ public function through($middleware)
      */
     public function chain($chain)
     {
-        $this->chained = collect($chain)->map(function ($job) {
+        $jobs = ChainedBatch::prepareNestedBatches(collect($chain));
+
+        $this->chained = $jobs->map(function ($job) {
             return $this->serializeJob($job);
         })->all();
 
@@ -212,7 +214,9 @@ public function chain($chain)
      */
     public function prependToChain($job)
     {
-        $this->chained = Arr::prepend($this->chained, $this->serializeJob($job));
+        $jobs = ChainedBatch::prepareNestedBatches(collect([$job]));
+
+        $this->chained = Arr::prepend($this->chained, $this->serializeJob($jobs->first()));
 
         return $this;
     }
@@ -225,7 +229,9 @@ public function prependToChain($job)
      */
     public function appendToChain($job)
     {
-        $this->chained = array_merge($this->chained, [$this->serializeJob($job)]);
+        $jobs = ChainedBatch::prepareNestedBatches(collect([$job]));
+
+        $this->chained = array_merge($this->chained, [$this->serializeJob($jobs->first())]);
 
         return $this;
     }