Accept closure in bus assertion helpers (#46075)

* Accept a closure as the first argument for `assertDispatchedTimes()` helper

* Accept a closure as the first argument for `assertDispatchedSyncTimes()` helper

* Accept a closure as the first argument for `assertDispatchedAfterResponseTimes()` helper

* formatting

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: markwalet

Facades/Bus.php

@@ -21,18 +21,18 @@
  * @method static \Illuminate\Bus\Dispatcher pipeThrough(array $pipes)
  * @method static \Illuminate\Bus\Dispatcher map(array $map)
  * @method static void except(array|string $jobsToDispatch)
- * @method static void assertDispatched(string|\Closure $command, callable|int|null $callback = null)
- * @method static void assertDispatchedTimes(string $command, int $times = 1)
- * @method static void assertNotDispatched(string|\Closure $command, callable|null $callback = null)
+ * @method static void assertDispatched(\Closure|string $command, callable|int|null $callback = null)
+ * @method static void assertDispatchedTimes(\Closure|string $command, int $times = 1)
+ * @method static void assertNotDispatched(\Closure|string $command, callable|null $callback = null)
  * @method static void assertNothingDispatched()
- * @method static void assertDispatchedSync(string|\Closure $command, callable|int|null $callback = null)
- * @method static void assertDispatchedSyncTimes(string $command, int $times = 1)
- * @method static void assertNotDispatchedSync(string|\Closure $command, callable|null $callback = null)
- * @method static void assertDispatchedAfterResponse(string|\Closure $command, callable|int|null $callback = null)
- * @method static void assertDispatchedAfterResponseTimes(string $command, int $times = 1)
- * @method static void assertNotDispatchedAfterResponse(string|\Closure $command, callable|null $callback = null)
+ * @method static void assertDispatchedSync(\Closure|string $command, callable|int|null $callback = null)
+ * @method static void assertDispatchedSyncTimes(\Closure|string $command, int $times = 1)
+ * @method static void assertNotDispatchedSync(\Closure|string $command, callable|null $callback = null)
+ * @method static void assertDispatchedAfterResponse(\Closure|string $command, callable|int|null $callback = null)
+ * @method static void assertDispatchedAfterResponseTimes(\Closure|string $command, int $times = 1)
+ * @method static void assertNotDispatchedAfterResponse(\Closure|string $command, callable|null $callback = null)
  * @method static void assertChained(array $expectedChain)
- * @method static void assertDispatchedWithoutChain(string|\Closure $command, callable|null $callback = null)
+ * @method static void assertDispatchedWithoutChain(\Closure|string $command, callable|null $callback = null)
  * @method static void assertBatched(callable $callback)
  * @method static void assertBatchCount(int $count)
  * @method static void assertNothingBatched()

Testing/Fakes/BusFake.php

@@ -127,15 +127,21 @@ public function assertDispatched($command, $callback = null)
     /**
      * Assert if a job was pushed a number of times.
      *
-     * @param  string  $command
+     * @param  string|\Closure  $command
      * @param  int  $times
      * @return void
      */
     public function assertDispatchedTimes($command, $times = 1)
     {
-        $count = $this->dispatched($command)->count() +
-                 $this->dispatchedAfterResponse($command)->count() +
-                 $this->dispatchedSync($command)->count();
+        $callback = null;
+
+        if ($command instanceof Closure) {
+            [$command, $callback] = [$this->firstClosureParameterType($command), $command];
+        }
+
+        $count = $this->dispatched($command, $callback)->count() +
+                 $this->dispatchedAfterResponse($command, $callback)->count() +
+                 $this->dispatchedSync($command, $callback)->count();
 
         PHPUnit::assertSame(
             $times, $count,
@@ -200,13 +206,19 @@ public function assertDispatchedSync($command, $callback = null)
     /**
      * Assert if a job was pushed synchronously a number of times.
      *
-     * @param  string  $command
+     * @param  string|\Closure  $command
      * @param  int  $times
      * @return void
      */
     public function assertDispatchedSyncTimes($command, $times = 1)
     {
-        $count = $this->dispatchedSync($command)->count();
+        $callback = null;
+
+        if ($command instanceof Closure) {
+            [$command, $callback] = [$this->firstClosureParameterType($command), $command];
+        }
+
+        $count = $this->dispatchedSync($command, $callback)->count();
 
         PHPUnit::assertSame(
             $times, $count,
@@ -259,13 +271,19 @@ public function assertDispatchedAfterResponse($command, $callback = null)
     /**
      * Assert if a job was pushed after the response was sent a number of times.
      *
-     * @param  string  $command
+     * @param  string|\Closure  $command
      * @param  int  $times
      * @return void
      */
     public function assertDispatchedAfterResponseTimes($command, $times = 1)
     {
-        $count = $this->dispatchedAfterResponse($command)->count();
+        $callback = null;
+
+        if ($command instanceof Closure) {
+            [$command, $callback] = [$this->firstClosureParameterType($command), $command];
+        }
+
+        $count = $this->dispatchedAfterResponse($command, $callback)->count();
 
         PHPUnit::assertSame(
             $times, $count,