@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use GuzzleHttp\Middleware; |
| 7 | 7 | use GuzzleHttp\Promise\PromiseInterface; |
| 8 | 8 | use Illuminate\Bus\Queueable; |
| 9 | -use GuzzleHttp\Promise\Promise; |
|
| 10 | 9 | use Illuminate\Contracts\Bus\SelfHandling; |
| 11 | 10 | use Mpociot\CaptainHook\WebhookLog; |
| 12 | 11 | use Illuminate\Queue\SerializesModels; |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | $webhook->logs()->orderBy('updated_at', 'desc')->first()->delete(); |
| 65 | 65 | } |
| 66 | 66 | $log = new WebhookLog([ |
| 67 | - 'webhook_id' => $webhook[ 'id' ], |
|
| 68 | - 'url' => $webhook[ 'url' ], |
|
| 67 | + 'webhook_id' => $webhook['id'], |
|
| 68 | + 'url' => $webhook['url'], |
|
| 69 | 69 | ]); |
| 70 | - $middleware = Middleware::tap(function (RequestInterface $request, $options) use ($log) { |
|
| 70 | + $middleware = Middleware::tap(function(RequestInterface $request, $options) use ($log) { |
|
| 71 | 71 | $log->payload_format = isset($request->getHeader('Content-Type')[0]) ? $request->getHeader('Content-Type')[0] : null; |
| 72 | 72 | $log->payload = $request->getBody()->getContents(); |
| 73 | - }, function ($request, $options, PromiseInterface $response) use ($log) { |
|
| 74 | - $response->then(function (ResponseInterface $response) use ($log) { |
|
| 73 | + }, function($request, $options, PromiseInterface $response) use ($log) { |
|
| 74 | + $response->then(function(ResponseInterface $response) use ($log) { |
|
| 75 | 75 | $log->status = $response->getStatusCode(); |
| 76 | 76 | $log->response = $response->getBody()->getContents(); |
| 77 | 77 | $log->response_format = $log->payload_format = isset($response->getHeader('Content-Type')[0]) ? $response->getHeader('Content-Type')[0] : null; |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | }); |
| 86 | 86 | }); |
| 87 | 87 | |
| 88 | - $client->post($webhook[ 'url' ], [ |
|
| 88 | + $client->post($webhook['url'], [ |
|
| 89 | 89 | 'exceptions' => false, |
| 90 | 90 | 'body' => $this->eventData, |
| 91 | 91 | 'verify' => false, |
| 92 | 92 | 'handler' => $middleware($client->getConfig('handler')), |
| 93 | 93 | ]); |
| 94 | 94 | } else { |
| 95 | - $client->post($webhook[ 'url' ], [ |
|
| 95 | + $client->post($webhook['url'], [ |
|
| 96 | 96 | 'exceptions' => false, |
| 97 | 97 | 'body' => $this->eventData, |
| 98 | 98 | 'verify' => false, |