|
20 | 20 |
|
21 | 21 | use function Safe\json_decode;
|
22 | 22 | use function Safe\json_encode;
|
23 |
| -use function Safe\preg_replace; |
24 | 23 |
|
25 | 24 | class CloudTasksQueue extends LaravelQueue implements QueueContract
|
26 | 25 | {
|
@@ -113,7 +112,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
|
113 | 112 |
|
114 | 113 | $payload = (array) json_decode($payload, true);
|
115 | 114 |
|
116 |
| - $task = tap(new Task())->setName($this->taskName($queue, $payload)); |
| 115 | + $task = tap(new Task())->setName($this->taskName($queue)); |
117 | 116 |
|
118 | 117 | $payload = $this->enrichPayloadWithInternalData(
|
119 | 118 | payload: $payload,
|
@@ -144,29 +143,16 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
|
144 | 143 | return $payload['uuid'];
|
145 | 144 | }
|
146 | 145 |
|
147 |
| - private function taskName(string $queueName, array $payload): string |
| 146 | + private function taskName(string $queueName): string |
148 | 147 | {
|
149 |
| - $displayName = $this->sanitizeTaskName($payload['displayName']); |
150 |
| - |
151 | 148 | return CloudTasksClient::taskName(
|
152 | 149 | $this->config['project'],
|
153 | 150 | $this->config['location'],
|
154 | 151 | $queueName,
|
155 |
| - $displayName.'-'.bin2hex(random_bytes(8)), |
| 152 | + bin2hex(random_bytes(16)), |
156 | 153 | );
|
157 | 154 | }
|
158 | 155 |
|
159 |
| - private function sanitizeTaskName(string $taskName): string |
160 |
| - { |
161 |
| - // Remove all characters that are not -, letters, numbers, or whitespace |
162 |
| - $sanitizedName = preg_replace('![^-\pL\pN\s]+!u', '-', $taskName); |
163 |
| - |
164 |
| - // Replace all separator characters and whitespace by a - |
165 |
| - $sanitizedName = preg_replace('![-\s]+!u', '-', $sanitizedName); |
166 |
| - |
167 |
| - return trim($sanitizedName, '-'); |
168 |
| - } |
169 |
| - |
170 | 156 | private function enrichPayloadWithInternalData(
|
171 | 157 | array $payload,
|
172 | 158 | string $queueName,
|
|
0 commit comments