Refactor

Author: Marick van Tuil

phpstan.neon

@@ -6,4 +6,6 @@ parameters:
         - src
     level: 9
     ignoreErrors:
-        - "/dispatchAfterCommit with no type specified/"
+        - "/dispatchAfterCommit with no type specified/"
+        - message: "#Illuminate\\\\Queue\\\\Events\\\\Queue(Paused|Resumed)#"
+          identifier: class.notFound

src/CloudTasksApiFake.php

@@ -103,11 +103,11 @@ public function assertCreatedTaskCount(int $count): void
 
     public function assertQueuePaused(string $queue): void
     {
-        Assert::assertTrue($this->pausedQueues[$queue] ?? null, 'Expected queue ['.$queue.'] to be paused, but is not');
+        Assert::assertArrayHasKey($queue, $this->pausedQueues, 'Expected queue ['.$queue.'] to be paused, but it is not.');
     }
 
     public function assertQueueNotPaused(string $queue): void
     {
-        Assert::assertNotTrue($this->pausedQueues[$queue] ?? null, 'Expected queue ['.$queue.'] to not be paused, but it is');
+        Assert::assertArrayNotHasKey($queue, $this->pausedQueues, 'Expected queue ['.$queue.'] to not be paused, but it is.');
     }
 }

src/CloudTasksServiceProvider.php

@@ -117,29 +117,25 @@ private function registerEvents(): void
             }
         });
 
-        if (class_exists('Illuminate\Queue\Events\QueuePaused')) {
-            $events->listen(QueuePaused::class, function (QueuePaused $event) { // @phpstan-ignore-line
-                $queue = Queue::connection($event->connection); // @phpstan-ignore-line
-
-                if (! $queue instanceof CloudTasksQueue) {
-                    return;
-                }
-
-                $queue->pause($event->queue); // @phpstan-ignore-line
-            });
+        if (! class_exists(QueuePaused::class)) {
+            return;
         }
 
-        if (class_exists('Illuminate\Queue\Events\QueueResumed')) {
-            $events->listen(QueueResumed::class, function (QueueResumed $event) { // @phpstan-ignore-line
-                $queue = Queue::connection($event->connection); // @phpstan-ignore-line
+        $events->listen(QueuePaused::class, function (QueuePaused $event) {
+            $queue = Queue::connection($event->connection);
 
-                if (! $queue instanceof CloudTasksQueue) {
-                    return;
-                }
+            if ($queue instanceof CloudTasksQueue) {
+                $queue->pause($event->queue);
+            }
+        });
 
-                $queue->resume($event->queue); // @phpstan-ignore-line
-            });
-        }
+        $events->listen(QueueResumed::class, function (QueueResumed $event) {
+            $queue = Queue::connection($event->connection);
+
+            if ($queue instanceof CloudTasksQueue) {
+                $queue->resume($event->queue);
+            }
+        });
     }
 
     private function registerCommands(): void

tests/PauseResumeQueueTest.php

@@ -10,36 +10,32 @@
 
 class PauseResumeQueueTest extends TestCase
 {
-    #[Test]
-    public function queue_can_be_paused(): void
+    protected function setUp(): void
     {
-        // Arrange
-        if (app()->version() < 12) {
+        parent::setUp();
+
+        if (version_compare(app()->version(), '12.0.0', '<')) {
             $this->markTestSkipped('This feature only exists in Laravel 12 and up.');
         }
 
         CloudTasksApi::fake();
+    }
 
+    #[Test]
+    public function queue_can_be_paused(): void
+    {
         Artisan::call('queue:pause my-cloudtasks-connection:barbequeue');
 
-        // Assert
-        CloudTasksApi::assertQueuePaused('barbequeue');
+        CloudTasksApi::assertQueuePaused('projects/my-test-project/locations/europe-west6/queues/barbequeue');
     }
 
     #[Test]
     public function queue_can_be_resumed(): void
     {
-        // Arrange
-        if (app()->version() < 12) {
-            $this->markTestSkipped('This feature only exists in Laravel 12 and up.');
-        }
-
-        CloudTasksApi::fake();
-
         Artisan::call('queue:pause my-cloudtasks-connection:barbequeue');
-        Artisan::call('queue:continue my-cloudtasks-connection:barbequeue');
+        CloudTasksApi::assertQueuePaused('projects/my-test-project/locations/europe-west6/queues/barbequeue');
 
-        // Assert
-        CloudTasksApi::assertQueueNotPaused('barbequeue');
+        Artisan::call('queue:continue my-cloudtasks-connection:barbequeue');
+        CloudTasksApi::assertQueueNotPaused('projects/my-test-project/locations/europe-west6/queues/barbequeue');
     }
 }