Refactor & cleanup

Author: marickvantuil

src/CloudTasksConnector.php

@@ -11,18 +11,10 @@ class CloudTasksConnector implements ConnectorInterface
 {
     public function connect(array $config): CloudTasksQueue
     {
-        // The handler is the URL which Cloud Tasks will call with the job payload. This
-        // URL of the handler can be manually set through an environment variable, but
-        // if it is not then we will choose a sensible default (the current app url)
-        if (empty($config['handler'])) {
-            // At this point (during service provider boot) the trusted proxy middleware
-            // has not been set up, and so we are not ready to get the scheme and host
-            // So we wrap it and get it later, after the middleware has been set up.
-            $config['handler'] = function () {
-                return request()->getSchemeAndHttpHost();
-            };
-        }
-
-        return new CloudTasksQueue($config, app(CloudTasksClient::class), $config['after_commit'] ?? null);
+        return new CloudTasksQueue(
+            config: $config,
+            client: app(CloudTasksClient::class),
+            dispatchAfterCommit: $config['after_commit'] ?? null
+        );
     }
 }

src/CloudTasksJob.php

@@ -23,6 +23,11 @@ class CloudTasksJob extends LaravelJob implements JobContract
 
     protected $queue;
 
+    /**
+     * @param  array  $job
+     * @param  string  $connectionName
+     * @param  string  $queue
+     */
     public function __construct(Container $container, CloudTasksQueue $cloudTasksQueue, $job, $connectionName, $queue)
     {
         $this->container = $container;

src/CloudTasksQueue.php

@@ -108,13 +108,12 @@ function ($payload, $queue, $delay) {
     protected function pushToCloudTasks($queue, $payload, $delay = 0)
     {
         $queue = $queue ?: $this->config['queue'];
-        $queueName = $this->client->queueName($this->config['project'], $this->config['location'], $queue);
-        $availableAt = $this->availableAt($delay);
 
-        $payload = json_decode($payload, true);
+        $payload = (array) json_decode($payload, true);
 
-        $task = new Task();
-        $task->setName($this->taskName($queue, $payload));
+        $task = new Task([
+            'name' => $this->taskName($queue, $payload),
+        ]);
 
         $payload = $this->withAttempts($payload);
         $payload = $this->withQueueName($payload, $queue);
@@ -155,10 +154,12 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
             $task->setDispatchDeadline(new Duration(['seconds' => $this->config['dispatch_deadline']]));
         }
 
+        $availableAt = $this->availableAt($delay);
         if ($availableAt > time()) {
             $task->setScheduleTime(new Timestamp(['seconds' => $availableAt]));
         }
 
+        $queueName = $this->client->queueName($this->config['project'], $this->config['location'], $queue);
         CloudTasksApi::createTask($queueName, $task);
 
         event((new TaskCreated)->queue($queue)->task($task));
@@ -255,11 +256,15 @@ public function release(CloudTasksJob $job, int $delay = 0): void
 
     public function getHandler(): string
     {
+        if (empty($this->config['handler'])) {
+            $this->config['handler'] = request()->getSchemeAndHttpHost();
+        }
+
         $handler = rtrim($this->config['handler'], '/');
 
         return match (true) {
             ! str_ends_with($handler, '/handle-task') => $handler.'/handle-task',
-            default => $handler,
+            default => $this->config['handler'],
         };
     }
 }