Merge pull request #26 from mpociot/analysis-zGDLMg

Applied fixes from StyleCI

src/Mpociot/CaptainHook/CaptainHookServiceProvider.php

@@ -112,7 +112,7 @@ protected function publishSparkResources()
 
         $this->publishes([
             __DIR__.'/../../resources/assets/js/' => base_path('resources/assets/js/components/'),
-            __DIR__ . '/../../resources/views/' => base_path('resources/views/vendor/captainhook/settings/'),
+            __DIR__.'/../../resources/views/' => base_path('resources/views/vendor/captainhook/settings/'),
         ], 'spark-resources');
     }
 
@@ -122,7 +122,7 @@ protected function publishSparkResources()
     protected function registerEventListeners()
     {
         foreach ($this->listeners as $eventName) {
-            $this->app[ 'events' ]->listen($eventName, [$this, 'handleEvent']);
+            $this->app['events']->listen($eventName, [$this, 'handleEvent']);
         }
     }
 
@@ -214,15 +214,15 @@ public function handleEvent($eventData)
      */
     protected function registerCommands()
     {
-        $this->app[ 'hook.list' ] = $this->app->share(function () {
+        $this->app['hook.list'] = $this->app->share(function () {
             return new ListWebhooks();
         });
 
-        $this->app[ 'hook.add' ] = $this->app->share(function () {
+        $this->app['hook.add'] = $this->app->share(function () {
             return new AddWebhook();
         });
 
-        $this->app[ 'hook.delete' ] = $this->app->share(function () {
+        $this->app['hook.delete'] = $this->app->share(function () {
             return new DeleteWebhook();
         });
 
@@ -232,13 +232,14 @@ protected function registerCommands()
             'hook.delete'
         );
     }
+
     /**
-     * Register predefined routes used for Spark
+     * Register predefined routes used for Spark.
      */
     protected function registerRoutes()
     {
         if (class_exists('Laravel\Spark\Providers\AppServiceProvider')) {
-            include __DIR__ . '/../../routes.php';
+            include __DIR__.'/../../routes.php';
         }
     }
 }

src/Mpociot/CaptainHook/Http/Requests/CreateWebhookRequest.php

@@ -15,15 +15,15 @@ public function authorize()
     {
         return true;
     }
-    
+
     /**
      * @return array
      */
     public function rules()
     {
         return [
             'url' => 'required|url',
-            'event' => 'required'
+            'event' => 'required',
         ];
     }
 }

src/Mpociot/CaptainHook/Http/Requests/UpdateWebhookRequest.php

@@ -15,15 +15,15 @@ public function authorize()
     {
         return true;
     }
-    
+
     /**
      * @return array
      */
     public function rules()
     {
         return [
             'url' => 'required|url',
-            'event' => 'required'
+            'event' => 'required',
         ];
     }
 }

src/Mpociot/CaptainHook/Http/WebhookController.php

@@ -10,7 +10,6 @@
 
 class WebhookController extends Controller
 {
-
     /**
      * Create a new controller instance.
      *
@@ -46,7 +45,7 @@ public function store(CreateWebhookRequest $request)
         $hook = Webhook::create([
             'url' => $request->url,
             'tenant_id' => $request->user()->getKey(),
-            'event' => $request->event
+            'event' => $request->event,
         ]);
 
         return response()->json($hook);

src/Mpociot/CaptainHook/Http/WebhookEventsController.php

@@ -7,7 +7,6 @@
 
 class WebhookEventsController extends Controller
 {
-
     /**
      * Create a new controller instance.
      *
@@ -28,7 +27,7 @@ public function all(Request $request)
         return collect(config('captain_hook.listeners', []))->transform(function ($key, $value) {
             return [
                 'name' => $value,
-                'event' => $key
+                'event' => $key,
             ];
         })->values();
     }

src/Mpociot/CaptainHook/Jobs/TriggerWebhooksJob.php

@@ -87,8 +87,8 @@ public function handle()
                     $webhook->logs()->orderBy('updated_at', 'desc')->first()->delete();
                 }
                 $log = new WebhookLog([
-                    'webhook_id' => $webhook[ 'id' ],
-                    'url' => $webhook[ 'url' ],
+                    'webhook_id' => $webhook['id'],
+                    'url' => $webhook['url'],
                 ]);
                 $middleware = Middleware::tap(function (RequestInterface $request, $options) use ($log) {
                     $log->payload_format = isset($request->getHeader('Content-Type')[0]) ? $request->getHeader('Content-Type')[0] : null;
@@ -110,14 +110,14 @@ public function handle()
                     });
                 });
 
-                $client->post($webhook[ 'url' ], [
+                $client->post($webhook['url'], [
                     'exceptions' => false,
                     'body' => $transformer($this->eventData, $webhook),
                     'verify' => false,
                     'handler' => $middleware($client->getConfig('handler')),
                 ]);
             } else {
-                $client->post($webhook[ 'url' ], [
+                $client->post($webhook['url'], [
                     'exceptions' => false,
                     'body' => $transformer($this->eventData, $webhook),
                     'verify' => false,

src/Mpociot/CaptainHook/Webhook.php

@@ -61,6 +61,6 @@ public function logs()
      */
     public function lastLog()
     {
-        return $this->hasOne(WebhookLog::class)->orderBy('created_at','DESC');
+        return $this->hasOne(WebhookLog::class)->orderBy('created_at', 'DESC');
     }
 }

src/config/config.php

@@ -18,7 +18,7 @@
     | respond to eloquent events, but you may edit this as you like.
     */
     'listeners' => [
-        'Eloquent' => 'eloquent.*'
+        'Eloquent' => 'eloquent.*',
     ],
 
     /*

src/routes.php

@@ -7,4 +7,4 @@
     $router->delete('/settings/api/webhook/{webhook_id}', 'Mpociot\CaptainHook\Http\WebhookController@destroy');
 
     $router->get('/settings/api/webhooks/events', 'Mpociot\CaptainHook\Http\WebhookEventsController@all');
-});
+});