-
Notifications
You must be signed in to change notification settings - Fork 11.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[11.x] Add
Skip
middleware for Queue Jobs (#52645)
* [11.x] Add `Skip` middleware for Queue Jobs * CS Fixes * formatting --------- Co-authored-by: Taylor Otwell <[email protected]>
- Loading branch information
1 parent
167d554
commit b7c6287
Showing
2 changed files
with
176 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<?php | ||
|
||
namespace Illuminate\Queue\Middleware; | ||
|
||
use Closure; | ||
|
||
class Skip | ||
{ | ||
public function __construct(protected bool $skip = false) | ||
{ | ||
} | ||
|
||
/** | ||
* Apply the middleware if the given condition is truthy. | ||
* | ||
* @param bool|Closure(): bool $condition | ||
*/ | ||
public static function when(Closure|bool $condition): self | ||
{ | ||
return new self(value($condition)); | ||
} | ||
|
||
/** | ||
* Apply the middleware unless the given condition is truthy. | ||
* | ||
* @param bool|Closure(): bool $condition | ||
*/ | ||
public static function unless(Closure|bool $condition): self | ||
{ | ||
return new self(! value($condition)); | ||
} | ||
|
||
/** | ||
* Handle the job. | ||
*/ | ||
public function handle(mixed $job, callable $next): mixed | ||
{ | ||
if ($this->skip) { | ||
return false; | ||
} | ||
|
||
return $next($job); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\Integration\Queue; | ||
|
||
use Illuminate\Bus\Dispatcher; | ||
use Illuminate\Bus\Queueable; | ||
use Illuminate\Contracts\Queue\Job; | ||
use Illuminate\Queue\CallQueuedHandler; | ||
use Illuminate\Queue\InteractsWithQueue; | ||
use Illuminate\Queue\Middleware\Skip; | ||
use Laravel\SerializableClosure\SerializableClosure; | ||
use Mockery as m; | ||
use Orchestra\Testbench\TestCase; | ||
|
||
class SkipMiddlewareTest extends TestCase | ||
{ | ||
public function testJobIsSkippedWhenConditionIsTrue() | ||
{ | ||
$job = new SkipTestJob(skip: true); | ||
|
||
$this->assertJobWasSkipped($job); | ||
} | ||
|
||
public function testJobIsSkippedWhenConditionIsTrueUsingClosure() | ||
{ | ||
$job = new SkipTestJob(skip: new SerializableClosure(fn () => true)); | ||
|
||
$this->assertJobWasSkipped($job); | ||
} | ||
|
||
public function testJobIsNotSkippedWhenConditionIsFalse() | ||
{ | ||
$job = new SkipTestJob(skip: false); | ||
|
||
$this->assertJobRanSuccessfully($job); | ||
} | ||
|
||
public function testJobIsNotSkippedWhenConditionIsFalseUsingClosure() | ||
{ | ||
$job = new SkipTestJob(skip: new SerializableClosure(fn () => false)); | ||
|
||
$this->assertJobRanSuccessfully($job); | ||
} | ||
|
||
public function testJobIsNotSkippedWhenConditionIsTrueWithUnless() | ||
{ | ||
$job = new SkipTestJob(skip: true, useUnless: true); | ||
|
||
$this->assertJobRanSuccessfully($job); | ||
} | ||
|
||
public function testJobIsNotSkippedWhenConditionIsTrueWithUnlessUsingClosure() | ||
{ | ||
$job = new SkipTestJob(skip: new SerializableClosure(fn () => true), useUnless: true); | ||
|
||
$this->assertJobRanSuccessfully($job); | ||
} | ||
|
||
public function testJobIsSkippedWhenConditionIsFalseWithUnless() | ||
{ | ||
$job = new SkipTestJob(skip: false, useUnless: true); | ||
|
||
$this->assertJobWasSkipped($job); | ||
} | ||
|
||
public function testJobIsSkippedWhenConditionIsFalseWithUnlessUsingClosure() | ||
{ | ||
$job = new SkipTestJob(skip: new SerializableClosure(fn () => false), useUnless: true); | ||
|
||
$this->assertJobWasSkipped($job); | ||
} | ||
|
||
protected function assertJobRanSuccessfully(SkipTestJob $class) | ||
{ | ||
$this->assertJobHandled(class: $class, expectedHandledValue: true); | ||
} | ||
|
||
protected function assertJobWasSkipped(SkipTestJob $class) | ||
{ | ||
$this->assertJobHandled(class: $class, expectedHandledValue: false); | ||
} | ||
|
||
protected function assertJobHandled(SkipTestJob $class, bool $expectedHandledValue) | ||
{ | ||
$class::$handled = false; | ||
$instance = new CallQueuedHandler(new Dispatcher($this->app), $this->app); | ||
|
||
$job = m::mock(Job::class); | ||
|
||
$job->shouldReceive('hasFailed')->andReturn(false); | ||
$job->shouldReceive('isReleased')->andReturn(false); | ||
$job->shouldReceive('isDeletedOrReleased')->andReturn(false); | ||
$job->shouldReceive('delete')->once(); | ||
|
||
$instance->call($job, [ | ||
'command' => serialize($class), | ||
]); | ||
|
||
$this->assertEquals($expectedHandledValue, $class::$handled); | ||
} | ||
} | ||
|
||
class SkipTestJob | ||
{ | ||
use InteractsWithQueue, Queueable; | ||
|
||
public static $handled = false; | ||
|
||
public function __construct( | ||
protected bool|SerializableClosure $skip, | ||
protected bool $useUnless = false, | ||
) { | ||
} | ||
|
||
public function handle(): void | ||
{ | ||
static::$handled = true; | ||
} | ||
|
||
public function middleware(): array | ||
{ | ||
$skip = $this->skip instanceof SerializableClosure | ||
? $this->skip->getClosure() | ||
: $this->skip; | ||
|
||
if ($this->useUnless) { | ||
return [Skip::unless($skip)]; | ||
} | ||
|
||
return [Skip::when($skip)]; | ||
} | ||
} |