[9.x] fix adding jobs from iterable to the pending batch (#41786)

* fix adding jobs from iterable to the pending batch * code style * Update PendingBatch.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Apr 2, 2022 · 88e3617 · 88e3617
1 parent 9879b90
commit 88e3617
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/Illuminate/Bus/PendingBatch.php b/src/Illuminate/Bus/PendingBatch.php
@@ -57,12 +57,14 @@ public function __construct(Container $container, Collection $jobs)
     /**
      * Add jobs to the batch.
      *
-     * @param  \Illuminate\Support\Enumerable|object|array  $jobs
+     * @param  iterable|object|array  $jobs
      * @return $this
      */
     public function add($jobs)
     {
-        foreach (Arr::wrap($jobs) as $job) {
+        $jobs = is_iterable($jobs) ? $jobs : Arr::wrap($jobs);
+
+        foreach ($jobs as $job) {
             $this->jobs->push($job);
         }
 

diff --git a/tests/Bus/BusBatchTest.php b/tests/Bus/BusBatchTest.php
@@ -139,6 +139,25 @@ public function test_jobs_can_be_added_to_pending_batch()
         $this->assertCount(2, $batch->jobs);
     }
 
+    public function test_jobs_can_be_added_to_the_pending_batch_from_iterable()
+    {
+        $batch = new PendingBatch(new Container, collect());
+        $this->assertCount(0, $batch->jobs);
+
+        $count = 3;
+        $generator = function (int $jobsCount) {
+            for ($i = 0; $i < $jobsCount; $i++) {
+                yield new class
+                {
+                    use Batchable;
+                };
+            }
+        };
+
+        $batch->add($generator($count));
+        $this->assertCount($count, $batch->jobs);
+    }
+
     public function test_processed_jobs_can_be_calculated()
     {
         $queue = m::mock(Factory::class);