Skip to content

Commit 647bddc

Browse files
committed
Fix Batchable batching state checks
1 parent 1baaf22 commit 647bddc

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

src/Illuminate/Bus/Batchable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function batching()
4848
{
4949
$batch = $this->batch();
5050

51-
return $batch && ! $batch->cancelled();
51+
return $batch && ! $batch->finished() && ! $batch->cancelled();
5252
}
5353

5454
/**

tests/Bus/BusBatchableTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,16 @@ public function test_batching_reflects_cancelled_state()
6565
$job->batch()->cancel();
6666
$this->assertFalse($job->batching());
6767
}
68+
69+
public function test_batching_returns_false_when_batch_is_finished()
70+
{
71+
$job = new class
72+
{
73+
use Batchable;
74+
};
75+
76+
$job->withFakeBatch('test-batch-id', 'test-batch-name', finishedAt: \Carbon\CarbonImmutable::now());
77+
78+
$this->assertFalse($job->batching());
79+
}
6880
}

0 commit comments

Comments
 (0)