1616use Illuminate \Support \Carbon ;
1717use Illuminate \Support \Str ;
1818use Stackkit \LaravelGoogleCloudTasksQueue \Events \TaskCreated ;
19+
1920use function Safe \json_decode ;
2021use function Safe \json_encode ;
2122
@@ -38,7 +39,7 @@ public function __construct(array $config, CloudTasksClient $client, $dispatchAf
3839 /**
3940 * Get the size of the queue.
4041 *
41- * @param string|null $queue
42+ * @param string|null $queue
4243 * @return int
4344 */
4445 public function size ($ queue = null )
@@ -50,11 +51,11 @@ public function size($queue = null)
5051 /**
5152 * Fallback method for Laravel 6x and 7x
5253 *
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
5859 * @return mixed
5960 */
6061 protected function enqueueUsing ($ job , $ payload , $ queue , $ delay , $ callback )
@@ -69,9 +70,9 @@ protected function enqueueUsing($job, $payload, $queue, $delay, $callback)
6970 /**
7071 * Push a new job onto the queue.
7172 *
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
7576 * @return void
7677 */
7778 public function push ($ job , $ data = '' , $ queue = null )
@@ -90,25 +91,25 @@ function ($payload, $queue) {
9091 /**
9192 * Push a raw payload onto the queue.
9293 *
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
9697 * @return string
9798 */
9899 public function pushRaw ($ payload , $ queue = null , array $ options = [])
99100 {
100- $ delay = ! empty ($ options ['delay ' ]) ? $ options ['delay ' ] : 0 ;
101+ $ delay = !empty ($ options ['delay ' ]) ? $ options ['delay ' ] : 0 ;
101102
102103 return $ this ->pushToCloudTasks ($ queue , $ payload , $ delay );
103104 }
104105
105106 /**
106107 * Push a new job onto the queue after a delay.
107108 *
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
112113 * @return void
113114 */
114115 public function later ($ delay , $ job , $ data = '' , $ queue = null )
@@ -127,8 +128,8 @@ function ($payload, $queue, $delay) {
127128 /**
128129 * Push a job to Cloud Tasks.
129130 *
130- * @param string|null $queue
131- * @param string $payload
131+ * @param string|null $queue
132+ * @param string $payload
132133 * @param \DateTimeInterface|\DateInterval|int $delay
133134 * @return string
134135 */
@@ -204,7 +205,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
204205 private function withUuid (array $ payload ): array
205206 {
206207 if (!isset ($ payload ['uuid ' ])) {
207- $ payload ['uuid ' ] = (string ) Str::uuid ();
208+ $ payload ['uuid ' ] = (string )Str::uuid ();
208209 }
209210
210211 return $ payload ;
@@ -245,7 +246,7 @@ private function withAttempts(array $payload): array
245246 /**
246247 * Pop the next job off of the queue.
247248 *
248- * @param string|null $queue
249+ * @param string|null $queue
249250 * @return \Illuminate\Contracts\Queue\Job|null
250251 */
251252 public function pop ($ queue = null )
@@ -269,11 +270,13 @@ public function delete(CloudTasksJob $job): void
269270
270271 $ queue = $ job ->getQueue () ?: $ this ->config ['queue ' ]; // @todo: make this a helper method somewhere.
271272
273+ $ headerTaskName = request ()->headers ->get ('X-Cloudtasks-Taskname ' )
274+ ?? request ()->headers ->get ('X-AppEngine-TaskName ' );
272275 $ taskName = $ this ->client ->taskName (
273276 $ config ['project ' ],
274277 $ config ['location ' ],
275278 $ queue ,
276- (string ) request ()-> headers -> get ( ' X-Cloudtasks-Taskname ' )
279+ (string )$ headerTaskName
277280 );
278281
279282 CloudTasksApi::deleteTask ($ taskName );
0 commit comments