| @@ -12,7 +12,7 @@ | ||
| 12 | 12 | */ | 
| 13 | 13 | public function up() | 
| 14 | 14 |      { | 
| 15 | -        Schema::create('webhooks', function (Blueprint $table) { | |
| 15 | +        Schema::create('webhooks', function(Blueprint $table) { | |
| 16 | 16 |              $table->increments('id'); | 
| 17 | 17 |              $table->integer('tenant_id')->nullable(); | 
| 18 | 18 |              $table->string('url'); | 
| @@ -12,7 +12,7 @@ | ||
| 12 | 12 | */ | 
| 13 | 13 | public function up() | 
| 14 | 14 |      { | 
| 15 | -        Schema::create('webhook_logs', function (Blueprint $table) { | |
| 15 | +        Schema::create('webhook_logs', function(Blueprint $table) { | |
| 16 | 16 |              $table->increments('id'); | 
| 17 | 17 |              $table->integer('webhook_id')->unsigned()->nullable(); | 
| 18 | 18 |              $table->foreign('webhook_id')->references('id')->on('webhooks')->onDelete('set null'); | 
| @@ -31,16 +31,16 @@ | ||
| 31 | 31 |      { | 
| 32 | 32 | parent::boot(); | 
| 33 | 33 | |
| 34 | -        static::created(function ($results) { | |
| 34 | +        static::created(function($results) { | |
| 35 | 35 | Cache::forget(self::CACHE_KEY); | 
| 36 | 36 | }); | 
| 37 | 37 | |
| 38 | 38 | |
| 39 | -        static::updated(function ($results) { | |
| 39 | +        static::updated(function($results) { | |
| 40 | 40 | Cache::forget(self::CACHE_KEY); | 
| 41 | 41 | }); | 
| 42 | 42 | |
| 43 | -        static::deleted(function ($results) { | |
| 43 | +        static::deleted(function($results) { | |
| 44 | 44 | Cache::forget(self::CACHE_KEY); | 
| 45 | 45 | }); | 
| 46 | 46 | } | 
| @@ -36,7 +36,7 @@ discard block | ||
| 36 | 36 | /** | 
| 37 | 37 | * Create a new job instance. | 
| 38 | 38 | * | 
| 39 | - * @param array|\Illuminate\Support\Collection $webhooks | |
| 39 | + * @param \Illuminate\Support\Collection $webhooks | |
| 40 | 40 | * @param mixed $eventData | 
| 41 | 41 | */ | 
| 42 | 42 | public function __construct($webhooks, $eventData) | 
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | /** | 
| 49 | 49 | * Resolves a string or callable to a valid callable. | 
| 50 | 50 | * @param string|callable $transformer | 
| 51 | - * @param $defaultMethodName | |
| 51 | + * @param string $defaultMethodName | |
| 52 | 52 | * @return callable | 
| 53 | 53 | */ | 
| 54 | 54 | private function resolveCallable($transformer, $defaultMethodName) | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | private function resolveCallable($transformer, $defaultMethodName) | 
| 55 | 55 |      { | 
| 56 | 56 |          if (is_string($transformer)) { | 
| 57 | -            return function () use ($transformer, $defaultMethodName) { | |
| 57 | +            return function() use ($transformer, $defaultMethodName) { | |
| 58 | 58 | list($class, $method) = Str::parseCallback($transformer, $defaultMethodName); | 
| 59 | 59 | |
| 60 | 60 | return call_user_func_array([app($class), $method], func_get_args()); | 
| @@ -63,7 +63,7 @@ discard block | ||
| 63 | 63 | return $transformer; | 
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | -        return function () { | |
| 66 | +        return function() { | |
| 67 | 67 | }; | 
| 68 | 68 | } | 
| 69 | 69 | |
| @@ -95,11 +95,11 @@ discard block | ||
| 95 | 95 | 'webhook_id' => $webhook['id'], | 
| 96 | 96 | 'url' => $webhook['url'], | 
| 97 | 97 | ]); | 
| 98 | -                $middleware = Middleware::tap(function (RequestInterface $request, $options) use ($log) { | |
| 98 | +                $middleware = Middleware::tap(function(RequestInterface $request, $options) use ($log) { | |
| 99 | 99 |                      $log->payload_format = isset($request->getHeader('Content-Type')[0]) ? $request->getHeader('Content-Type')[0] : null; | 
| 100 | 100 | $log->payload = $request->getBody()->getContents(); | 
| 101 | -                }, function ($request, $options, PromiseInterface $response) use ($log, $webhook, $responseCallback) { | |
| 102 | -                    $response->then(function (ResponseInterface $response) use ($log, $webhook, $responseCallback) { | |
| 101 | +                }, function($request, $options, PromiseInterface $response) use ($log, $webhook, $responseCallback) { | |
| 102 | +                    $response->then(function(ResponseInterface $response) use ($log, $webhook, $responseCallback) { | |
| 103 | 103 | $log->status = $response->getStatusCode(); | 
| 104 | 104 | $log->response = $response->getBody()->getContents(); | 
| 105 | 105 |                          $log->response_format = $log->payload_format = isset($response->getHeader('Content-Type')[0]) ? $response->getHeader('Content-Type')[0] : null; | 
| @@ -30,7 +30,7 @@ discard block | ||
| 30 | 30 | | The tenant_id field can be used for verification. | 
| 31 | 31 | | | 
| 32 | 32 | */ | 
| 33 | -    'filter' => function ($webhook) { | |
| 33 | +    'filter' => function($webhook) { | |
| 34 | 34 | return true; | 
| 35 | 35 | }, | 
| 36 | 36 | |
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | | You can also use the 'Foo\Class@transform' notation if you want. | 
| 49 | 49 | | | 
| 50 | 50 | */ | 
| 51 | -    'transformer' => function ($eventData, $webhook) { | |
| 51 | +    'transformer' => function($eventData, $webhook) { | |
| 52 | 52 | return json_encode($eventData); | 
| 53 | 53 | }, | 
| 54 | 54 | |
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 | | You can also use the 'Foo\Class@handle' notation if you want. | 
| 66 | 66 | | | 
| 67 | 67 | */ | 
| 68 | -    'response_callback' => function ($webhook, $response) { | |
| 68 | +    'response_callback' => function($webhook, $response) { | |
| 69 | 69 | // Handle custom response status codes, ... | 
| 70 | 70 | }, | 
| 71 | 71 | |
| @@ -39,7 +39,7 @@ | ||
| 39 | 39 | * Create a new webhook for the user. | 
| 40 | 40 | * | 
| 41 | 41 | * @param CreateWebhookRequest $request | 
| 42 | - * @return Response | |
| 42 | + * @return \Illuminate\Http\JsonResponse | |
| 43 | 43 | */ | 
| 44 | 44 | public function store(CreateWebhookRequest $request) | 
| 45 | 45 |      { | 
| @@ -21,7 +21,7 @@ | ||
| 21 | 21 | /** | 
| 22 | 22 | * Get all of the available webhook events. | 
| 23 | 23 | * | 
| 24 | - * @return Response | |
| 24 | + * @return \Illuminate\Support\Collection | |
| 25 | 25 | */ | 
| 26 | 26 | public function all(Request $request) | 
| 27 | 27 |      { | 
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | */ | 
| 26 | 26 | public function all(Request $request) | 
| 27 | 27 |      { | 
| 28 | -        return collect(config('captain_hook.listeners', []))->transform(function ($key, $value) { | |
| 28 | +        return collect(config('captain_hook.listeners', []))->transform(function($key, $value) { | |
| 29 | 29 | return [ | 
| 30 | 30 | 'name' => $value, | 
| 31 | 31 | 'event' => $key | 
| @@ -142,7 +142,7 @@ discard block | ||
| 142 | 142 | public function setWebhooks($webhooks) | 
| 143 | 143 |      { | 
| 144 | 144 | $this->webhooks = $webhooks; | 
| 145 | -        $this->getCache()->rememberForever(Webhook::CACHE_KEY, function () { | |
| 145 | +        $this->getCache()->rememberForever(Webhook::CACHE_KEY, function() { | |
| 146 | 146 | return $this->webhooks; | 
| 147 | 147 | }); | 
| 148 | 148 | } | 
| @@ -152,8 +152,8 @@ discard block | ||
| 152 | 152 | */ | 
| 153 | 153 | public function getWebhooks() | 
| 154 | 154 |      { | 
| 155 | -        if (! $this->getCache()->has(Webhook::CACHE_KEY)) { | |
| 156 | -            $this->getCache()->rememberForever(Webhook::CACHE_KEY, function () { | |
| 155 | +        if (!$this->getCache()->has(Webhook::CACHE_KEY)) { | |
| 156 | +            $this->getCache()->rememberForever(Webhook::CACHE_KEY, function() { | |
| 157 | 157 | return Webhook::all(); | 
| 158 | 158 | }); | 
| 159 | 159 | } | 
| @@ -204,7 +204,7 @@ discard block | ||
| 204 | 204 |          $webhooks = $this->getWebhooks()->where('event', $eventName); | 
| 205 | 205 |          $webhooks = $webhooks->filter($this->config->get('captain_hook.filter', null)); | 
| 206 | 206 | |
| 207 | -        if (! $webhooks->isEmpty()) { | |
| 207 | +        if (!$webhooks->isEmpty()) { | |
| 208 | 208 | $this->dispatch(new TriggerWebhooksJob($webhooks, $eventData)); | 
| 209 | 209 | } | 
| 210 | 210 | } | 
| @@ -214,15 +214,15 @@ discard block | ||
| 214 | 214 | */ | 
| 215 | 215 | protected function registerCommands() | 
| 216 | 216 |      { | 
| 217 | -        $this->app['hook.list'] = $this->app->share(function () { | |
| 217 | +        $this->app['hook.list'] = $this->app->share(function() { | |
| 218 | 218 | return new ListWebhooks(); | 
| 219 | 219 | }); | 
| 220 | 220 | |
| 221 | -        $this->app['hook.add'] = $this->app->share(function () { | |
| 221 | +        $this->app['hook.add'] = $this->app->share(function() { | |
| 222 | 222 | return new AddWebhook(); | 
| 223 | 223 | }); | 
| 224 | 224 | |
| 225 | -        $this->app['hook.delete'] = $this->app->share(function () { | |
| 225 | +        $this->app['hook.delete'] = $this->app->share(function() { | |
| 226 | 226 | return new DeleteWebhook(); | 
| 227 | 227 | }); | 
| 228 | 228 | |
| @@ -1,6 +1,6 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -Route::group(['middleware' => ['web', 'auth']], function ($router) { | |
| 3 | +Route::group(['middleware' => ['web', 'auth']], function($router) { | |
| 4 | 4 |      $router->get('/settings/api/webhooks', 'Mpociot\CaptainHook\Http\WebhookController@all'); | 
| 5 | 5 |      $router->post('/settings/api/webhook', 'Mpociot\CaptainHook\Http\WebhookController@store'); | 
| 6 | 6 |      $router->put('/settings/api/webhook/{webhook_id}', 'Mpociot\CaptainHook\Http\WebhookController@update'); | 
| @@ -10,7 +10,7 @@ discard block | ||
| 10 | 10 | }); | 
| 11 | 11 | |
| 12 | 12 |  if (config('captain_hook.uses_api', false)) { | 
| 13 | -    Route::group(['middleware' => 'auth:api', 'prefix' => 'api'], function ($router) { | |
| 13 | +    Route::group(['middleware' => 'auth:api', 'prefix' => 'api'], function($router) { | |
| 14 | 14 |          $router->get('webhooks', 'Mpociot\CaptainHook\Http\WebhookController@all'); | 
| 15 | 15 |          $router->post('webhook', 'Mpociot\CaptainHook\Http\WebhookController@store'); | 
| 16 | 16 |          $router->put('webhook/{webhook_id}', 'Mpociot\CaptainHook\Http\WebhookController@update'); |