16
16
use Illuminate \Support \Carbon ;
17
17
use Illuminate \Support \Str ;
18
18
use Stackkit \LaravelGoogleCloudTasksQueue \Events \TaskCreated ;
19
+
19
20
use function Safe \json_decode ;
20
21
use function Safe \json_encode ;
21
22
@@ -38,7 +39,7 @@ public function __construct(array $config, CloudTasksClient $client, $dispatchAf
38
39
/**
39
40
* Get the size of the queue.
40
41
*
41
- * @param string|null $queue
42
+ * @param string|null $queue
42
43
* @return int
43
44
*/
44
45
public function size ($ queue = null )
@@ -50,11 +51,11 @@ public function size($queue = null)
50
51
/**
51
52
* Fallback method for Laravel 6x and 7x
52
53
*
53
- * @param \Closure|string|object $job
54
- * @param string $payload
55
- * @param string $queue
56
- * @param \DateTimeInterface|\DateInterval|int|null $delay
57
- * @param callable $callback
54
+ * @param \Closure|string|object $job
55
+ * @param string $payload
56
+ * @param string $queue
57
+ * @param \DateTimeInterface|\DateInterval|int|null $delay
58
+ * @param callable $callback
58
59
* @return mixed
59
60
*/
60
61
protected function enqueueUsing ($ job , $ payload , $ queue , $ delay , $ callback )
@@ -69,9 +70,9 @@ protected function enqueueUsing($job, $payload, $queue, $delay, $callback)
69
70
/**
70
71
* Push a new job onto the queue.
71
72
*
72
- * @param string|object $job
73
- * @param mixed $data
74
- * @param string|null $queue
73
+ * @param string|object $job
74
+ * @param mixed $data
75
+ * @param string|null $queue
75
76
* @return void
76
77
*/
77
78
public function push ($ job , $ data = '' , $ queue = null )
@@ -90,25 +91,25 @@ function ($payload, $queue) {
90
91
/**
91
92
* Push a raw payload onto the queue.
92
93
*
93
- * @param string $payload
94
- * @param string|null $queue
95
- * @param array $options
94
+ * @param string $payload
95
+ * @param string|null $queue
96
+ * @param array $options
96
97
* @return string
97
98
*/
98
99
public function pushRaw ($ payload , $ queue = null , array $ options = [])
99
100
{
100
- $ delay = ! empty ($ options ['delay ' ]) ? $ options ['delay ' ] : 0 ;
101
+ $ delay = !empty ($ options ['delay ' ]) ? $ options ['delay ' ] : 0 ;
101
102
102
103
return $ this ->pushToCloudTasks ($ queue , $ payload , $ delay );
103
104
}
104
105
105
106
/**
106
107
* Push a new job onto the queue after a delay.
107
108
*
108
- * @param \DateTimeInterface|\DateInterval|int $delay
109
- * @param string|object $job
110
- * @param mixed $data
111
- * @param string|null $queue
109
+ * @param \DateTimeInterface|\DateInterval|int $delay
110
+ * @param string|object $job
111
+ * @param mixed $data
112
+ * @param string|null $queue
112
113
* @return void
113
114
*/
114
115
public function later ($ delay , $ job , $ data = '' , $ queue = null )
@@ -127,8 +128,8 @@ function ($payload, $queue, $delay) {
127
128
/**
128
129
* Push a job to Cloud Tasks.
129
130
*
130
- * @param string|null $queue
131
- * @param string $payload
131
+ * @param string|null $queue
132
+ * @param string $payload
132
133
* @param \DateTimeInterface|\DateInterval|int $delay
133
134
* @return string
134
135
*/
@@ -204,7 +205,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
204
205
private function withUuid (array $ payload ): array
205
206
{
206
207
if (!isset ($ payload ['uuid ' ])) {
207
- $ payload ['uuid ' ] = (string ) Str::uuid ();
208
+ $ payload ['uuid ' ] = (string )Str::uuid ();
208
209
}
209
210
210
211
return $ payload ;
@@ -245,7 +246,7 @@ private function withAttempts(array $payload): array
245
246
/**
246
247
* Pop the next job off of the queue.
247
248
*
248
- * @param string|null $queue
249
+ * @param string|null $queue
249
250
* @return \Illuminate\Contracts\Queue\Job|null
250
251
*/
251
252
public function pop ($ queue = null )
@@ -269,11 +270,13 @@ public function delete(CloudTasksJob $job): void
269
270
270
271
$ queue = $ job ->getQueue () ?: $ this ->config ['queue ' ]; // @todo: make this a helper method somewhere.
271
272
273
+ $ headerTaskName = request ()->headers ->get ('X-Cloudtasks-Taskname ' )
274
+ ?? request ()->headers ->get ('X-AppEngine-TaskName ' );
272
275
$ taskName = $ this ->client ->taskName (
273
276
$ config ['project ' ],
274
277
$ config ['location ' ],
275
278
$ queue ,
276
- (string ) request ()-> headers -> get ( ' X-Cloudtasks-Taskname ' )
279
+ (string )$ headerTaskName
277
280
);
278
281
279
282
CloudTasksApi::deleteTask ($ taskName );
0 commit comments