Ensure queue property is nullable (#55058)

Author: timacdonald

src/Illuminate/Queue/Events/JobQueued.php

@@ -8,7 +8,7 @@ class JobQueued
      * Create a new event instance.
      *
      * @param  string  $connectionName  The connection name.
-     * @param  string  $queue  The queue name.
+     * @param  string|null  $queue  The queue name.
      * @param  string|int|null  $id  The job ID.
      * @param  \Closure|string|object  $job  The job instance.
      * @param  string  $payload  The job payload.

src/Illuminate/Queue/Events/JobQueueing.php

@@ -8,7 +8,7 @@ class JobQueueing
      * Create a new event instance.
      *
      * @param  string  $connectionName  The connection name.
-     * @param  string  $queue  The queue name.
+     * @param  string|null  $queue  The queue name.
      * @param  \Closure|string|object  $job  The job instance.
      * @param  string  $payload  The job payload.
      * @param  int|null  $delay  The number of seconds the job was delayed.

tests/Integration/Queue/JobDispatchingTest.php

@@ -7,7 +7,10 @@
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\Events\JobQueued;
+use Illuminate\Queue\Events\JobQueueing;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Config;
 use Orchestra\Testbench\Attributes\WithMigration;
 
 #[WithMigration]
@@ -135,6 +138,33 @@ public function testUniqueJobLockIsReleasedForJobDispatchedAfterResponse()
         $this->assertFalse(UniqueJob::$ran);
     }
 
+    public function testQueueMayBeNullForJobQueueingAndJobQueuedEvent()
+    {
+        Config::set('queue.default', 'database');
+        $events = [];
+        $this->app['events']->listen(function (JobQueueing $e) use (&$events) {
+            $events[] = $e;
+        });
+        $this->app['events']->listen(function (JobQueued $e) use (&$events) {
+            $events[] = $e;
+        });
+
+        MyTestDispatchableJob::dispatch();
+        dispatch(function () {
+            //
+        });
+
+        $this->assertCount(4, $events);
+        $this->assertInstanceOf(JobQueueing::class, $events[0]);
+        $this->assertNull($events[0]->queue);
+        $this->assertInstanceOf(JobQueued::class, $events[1]);
+        $this->assertNull($events[1]->queue);
+        $this->assertInstanceOf(JobQueueing::class, $events[2]);
+        $this->assertNull($events[2]->queue);
+        $this->assertInstanceOf(JobQueued::class, $events[3]);
+        $this->assertNull($events[3]->queue);
+    }
+
     /**
      * Helpers.
      */
@@ -178,3 +208,8 @@ public function uniqueId()
         return self::$value;
     }
 }
+
+class MyTestDispatchableJob implements ShouldQueue
+{
+    use Dispatchable;
+}

types/Queue/Events/JobQueued.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Queue\Events\JobQueued;
+
+use function PHPStan\Testing\assertType;
+
+$instance = new JobQueued(
+    connectionName: 'connection',
+    queue: null,
+    id: 'id',
+    job: fn () => null,
+    payload: '{}',
+    delay: null,
+);
+
+/**
+ * @see testQueueMayBeNullForJobQueueingAndJobQueuedEvent
+ */
+assertType('string|null', $instance->queue);

types/Queue/Events/JobQueueing.php

@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Queue\Events\JobQueueing;
+
+use function PHPStan\Testing\assertType;
+
+$instance = new JobQueueing(
+    connectionName: 'connection',
+    queue: null,
+    job: fn () => null,
+    payload: '{}',
+    delay: null,
+);
+
+/**
+ * @see testQueueMayBeNullForJobQueueingAndJobQueuedEvent
+ */
+assertType('string|null', $instance->queue);