Merge branch '9.x' into 10.x

bert-w · Apr 18, 2023 · 8ef7a8d · 8ef7a8d
2 parents a56d748 + 2a6713f
commit 8ef7a8d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/src/Illuminate/Bus/Dispatcher.php b/src/Illuminate/Bus/Dispatcher.php
@@ -263,7 +263,7 @@ protected function pushCommandToQueue($queue, $command)
     public function dispatchAfterResponse($command, $handler = null)
     {
         $this->container->terminating(function () use ($command, $handler) {
-            $this->dispatchNow($command, $handler);
+            $this->dispatchSync($command, $handler);
         });
     }
 

diff --git a/src/Illuminate/Foundation/Bus/Dispatchable.php b/src/Illuminate/Foundation/Bus/Dispatchable.php
@@ -84,7 +84,7 @@ public static function dispatchSync(...$arguments)
      */
     public static function dispatchAfterResponse(...$arguments)
     {
-        return app(Dispatcher::class)->dispatchAfterResponse(new static(...$arguments));
+        return self::dispatch(...$arguments)->afterResponse();
     }
 
     /**

diff --git a/tests/Integration/Queue/JobDispatchingTest.php b/tests/Integration/Queue/JobDispatchingTest.php
@@ -3,8 +3,11 @@
 namespace Illuminate\Tests\Integration\Queue;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
 use Orchestra\Testbench\TestCase;
 
 class JobDispatchingTest extends TestCase
@@ -70,6 +73,52 @@ public function testDoesNotDispatchConditionallyWithClosure()
 
         $this->assertTrue(Job::$ran);
     }
+
+    public function testUniqueJobLockIsReleasedForJobDispatchedAfterResponse()
+    {
+        // get initial terminatingCallbacks
+        $terminatingCallbacksReflectionProperty = (new \ReflectionObject($this->app))->getProperty('terminatingCallbacks');
+        $terminatingCallbacksReflectionProperty->setAccessible(true);
+        $startTerminatingCallbacks = $terminatingCallbacksReflectionProperty->getValue($this->app);
+
+        UniqueJob::dispatchAfterResponse('test');
+        $this->assertFalse(
+            $this->getJobLock(UniqueJob::class, 'test')
+        );
+
+        $this->app->terminate();
+        $this->assertTrue(UniqueJob::$ran);
+
+        $terminatingCallbacksReflectionProperty->setValue($this->app, $startTerminatingCallbacks);
+
+        UniqueJob::$ran = false;
+        UniqueJob::dispatch('test')->afterResponse();
+        $this->app->terminate();
+        $this->assertTrue(UniqueJob::$ran);
+
+        // acquire job lock and confirm that job is not dispatched after response
+        $this->assertTrue(
+            $this->getJobLock(UniqueJob::class, 'test')
+        );
+        $terminatingCallbacksReflectionProperty->setValue($this->app, $startTerminatingCallbacks);
+        UniqueJob::$ran = false;
+        UniqueJob::dispatch('test')->afterResponse();
+        $this->app->terminate();
+        $this->assertFalse(UniqueJob::$ran);
+
+        // confirm that dispatchAfterResponse also does not run
+        UniqueJob::dispatchAfterResponse('test');
+        $this->app->terminate();
+        $this->assertFalse(UniqueJob::$ran);
+    }
+
+    /**
+     * Helpers.
+     */
+    private function getJobLock($job, $value = null)
+    {
+        return $this->app->get(Repository::class)->lock('laravel_unique_job:'.$job.$value, 10)->get();
+    }
 }
 
 class Job implements ShouldQueue
@@ -96,3 +145,13 @@ public function replaceValue($value)
         static::$value = $value;
     }
 }
+
+class UniqueJob extends Job implements ShouldBeUnique
+{
+    use InteractsWithQueue;
+
+    public function uniqueId()
+    {
+        return self::$value;
+    }
+}