Queue Worker: firing the JobPopped event when $popCallbacks returns null

[rudenav]

Laravel Version

11.x

PHP Version

8.3

Database Driver & Version

No response

Description

When $popCallbacks is assigned to the Illuminate\Queue\Worker class and it returns null the JobPopped event is fired with $job value null

Steps To Reproduce

Illuminate\Queue\Worker::$popCallbacks['test'] = function($popJobCallback, $queue) {
return null;
}

2. queue:work --name=test
3. listen for the event JobPopped

Fix:

In the class Illuminate\Queue\Worker method getNextJob
Replace:

if (isset(static::$popCallbacks[$this->name])) {
    return tap(
        (static::$popCallbacks[$this->name])($popJobCallback, $queue),
        fn ($job) => $this->raiseAfterJobPopEvent($connection->getConnectionName(), $job)
    );
} 

with:

if (isset(static::$popCallbacks[$this->name])) {
    if (! is_null($job = (static::$popCallbacks[$this->name])($popJobCallback, $queue))) {
        $this->raiseAfterJobPopEvent($connection->getConnectionName(), $job);
    }

    return $job;
} 

[github-actions]

Thank you for reporting this issue!

As Laravel is an open source project, we rely on the community to help us diagnose and fix issues as it is not possible to research and fix every issue reported to us via GitHub.

If possible, please make a pull request fixing the issue you have described, along with corresponding tests. All pull requests are promptly reviewed by the Laravel team.

Thank you!