[8.x] Clean up custom Queue payload between tests

src/Illuminate/Queue/Queue.php

@@ -253,7 +253,7 @@ protected function createStringPayload($job, $queue, $data)
     /**
      * Register a callback to be executed when creating job payloads.
      *
-     * @param  callable  $callback
+     * @param  callable|null  $callback
      * @return void
      */
     public static function createPayloadUsing($callback)

src/Illuminate/Queue/QueueServiceProvider.php

@@ -27,6 +27,8 @@ class QueueServiceProvider extends ServiceProvider implements DeferrableProvider
      */
     public function register()
     {
+        Queue::createPayloadUsing(null);
+
         $this->registerManager();
         $this->registerConnection();
         $this->registerWorker();

tests/Integration/Queue/CustomPayloadTest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Queue;
+
+use Illuminate\Contracts\Bus\QueueingDispatcher;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\Queue;
+use Illuminate\Support\ServiceProvider;
+use Orchestra\Testbench\TestCase;
+
+class CustomPayloadTest extends TestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return [QueueServiceProvider::class];
+    }
+
+    public function websites()
+    {
+        yield ['laravel.com'];
+
+        yield ['blog.laravel.com'];
+    }
+
+    /**
+     * @dataProvider websites
+     */
+    public function test_custom_payload_gets_cleared_for_each_data_provider(string $websites)
+    {
+        $dispatcher = $this->app->make(QueueingDispatcher::class);
+
+        $dispatcher->dispatchToQueue(new MyJob);
+    }
+}
+
+class QueueServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->app->bind('one.time.password', function () {
+            return random_int(1, 10);
+        });
+
+        Queue::createPayloadUsing(function () {
+            $password = $this->app->make('one.time.password');
+
+            $this->app->offsetUnset('one.time.password');
+
+            return ['password' => $password];
+        });
+    }
+}
+
+class MyJob implements ShouldQueue
+{
+    public $connection = 'sync';
+
+    public function handle()
+    {
+    }
+}