wip

Author: marickvantuil

src/CloudTasksQueue.php

@@ -154,7 +154,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
         $task = $this->createTask();
         $task->setName($this->taskName($queue, $payload));
 
-        if ($this->config['app_engine']) {
+        if (!empty($this->config['app_engine'])) {
             $path = \Safe\parse_url(route('cloud-tasks.handle-task'), PHP_URL_PATH);
 
             $appEngineRequest = new AppEngineHttpRequest();

src/CloudTasksServiceProvider.php

@@ -32,9 +32,8 @@ private function registerClient(): void
         $this->app->singleton(CloudTasksClient::class, function ($app) {
             $config = config('queue.connections.cloudtasks');
             $options = [];
-            $x = $config['credential_file'];
-            if (!empty($x)) {
-                $options['credentials'] = $x;
+            if (!empty($config['credential_file'])) {
+                $options['credentials'] = $config['credential_file'];
             }
             return new CloudTasksClient($options);
         });

src/TaskHandler.php

@@ -36,10 +36,6 @@ class TaskHandler
      * @var RetryConfig
      */
     private $retryConfig = null;
-    /**
-     * @var string
-     */
-    private $taskName;
 
     public function __construct(CloudTasksClient $client)
     {
@@ -54,7 +50,7 @@ public function handle(?string $task = null): void
 
         $this->setQueue();
 
-        if (!$this->config['app_engine']) {
+        if (!empty($this->config['app_engine'])) {
             OpenIdVerificator::verify(request()->bearerToken(), $this->config);
         }
 
@@ -76,11 +72,10 @@ private function captureTask($task): array
             $array = [];
         }
 
-        $taskName = request()->header('X-CloudTasks-TaskName') ?? request()->header('X-AppEngine-TaskName');
         $validator = validator([
             'json'        => $task,
             'task'        => $array,
-            'name_header' => $taskName,
+            'name_header' => request()->header('X-CloudTasks-TaskName') ?? request()->header('X-AppEngine-TaskName'),
         ], [
             'json'        => 'required|json',
             'task'        => 'required|array',
@@ -90,7 +85,6 @@ private function captureTask($task): array
 
         try {
             $validator->validate();
-            $this->taskName = $taskName;
         } catch (ValidationException $e) {
             if (config('app.debug')) {
                 throw $e;
@@ -130,7 +124,7 @@ private function handleTask(array $task): void
             $this->config['project'],
             $this->config['location'],
             $job->getQueue() ?: $this->config['queue'],
-            $this->taskName,
+            request()->header('X-CloudTasks-TaskName') ?? request()->header('X-AppEngine-TaskName'),
         );
 
         try {
@@ -146,7 +140,7 @@ private function handleTask(array $task): void
         // If the task has a [X-CloudTasks-TaskRetryCount] header higher than 0, then
         // we know the job was created using an earlier version of the package. This
         // job does not have the attempts tracked internally yet.
-        $taskRetryCountHeader = request()->header('X-CloudTasks-TaskRetryCount');
+        $taskRetryCountHeader = request()->header('X-CloudTasks-TaskRetryCount') ?? request()->header('X-AppEngine-TaskRetryCount');
         if ($taskRetryCountHeader && (int)$taskRetryCountHeader > 0) {
             $job->setAttempts((int)$taskRetryCountHeader);
         } else {