fixed get next job method (#53962)

laravel · Dec 18, 2024 · 1f73ec9 · 1f73ec9
1 parent 6f767a2
commit 1f73ec9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -355,10 +355,11 @@ protected function getNextJob($connection, $queue)
 
         try {
             if (isset(static::$popCallbacks[$this->name])) {
-                return tap(
-                    (static::$popCallbacks[$this->name])($popJobCallback, $queue),
-                    fn ($job) => $this->raiseAfterJobPopEvent($connection->getConnectionName(), $job)
-                );
+                if (! is_null($job = (static::$popCallbacks[$this->name])($popJobCallback, $queue))) {
+                    $this->raiseAfterJobPopEvent($connection->getConnectionName(), $job);
+                }
+
+                return $job;
             }
 
             foreach (explode(',', $queue) as $index => $queue) {