Applied latest StyleCI changes

app/Actions/ActivityLogger.php

@@ -85,7 +85,7 @@ class ActivityLogger
     protected function dispatchWebhooks(string $type, $detail): void
     {
         $webhooks = Webhook::query()
-            ->whereHas('trackedEvents', function(Builder $query) use ($type) {
+            ->whereHas('trackedEvents', function (Builder $query) use ($type) {
                 $query->where('event', '=', $type)
                     ->orWhere('event', '=', 'all');
             })

app/Actions/ActivityQueries.php

@@ -109,5 +109,4 @@ class ActivityQueries
 
         return $newActivity;
     }
-
 }

app/Actions/DispatchWebhookJob.php

@@ -17,7 +17,10 @@ use Illuminate\Support\Facades\Log;
 
 class DispatchWebhookJob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * @var Webhook

app/Http/Controllers/BookshelfController.php

@@ -2,7 +2,6 @@
 
 namespace BookStack\Http\Controllers;
 
-use Activity;
 use BookStack\Actions\ActivityQueries;
 use BookStack\Actions\View;
 use BookStack\Entities\Models\Book;

app/Http/Controllers/WebhookController.php

@@ -24,6 +24,7 @@ class WebhookController extends Controller
             ->orderBy('name', 'desc')
             ->with('trackedEvents')
             ->get();
+
         return view('settings.webhooks.index', ['webhooks' => $webhooks]);
     }
 
@@ -53,6 +54,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents(array_values($validated['events']));
 
         $this->logActivity(ActivityType::WEBHOOK_CREATE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 
@@ -89,6 +91,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents($validated['events']);
 
         $this->logActivity(ActivityType::WEBHOOK_UPDATE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 
@@ -99,6 +102,7 @@ class WebhookController extends Controller
     {
         /** @var Webhook $webhook */
         $webhook = Webhook::query()->findOrFail($id);
+
         return view('settings.webhooks.delete', ['webhook' => $webhook]);
     }
 
@@ -114,6 +118,7 @@ class WebhookController extends Controller
         $webhook->delete();
 
         $this->logActivity(ActivityType::WEBHOOK_DELETE, $webhook);
+
         return redirect('/settings/webhooks');
     }
 }

database/factories/Actions/WebhookFactory.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class WebhookFactory extends Factory
 {
-
     protected $model = Webhook::class;
 
     /**

tests/Actions/AuditLogTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Actions;
 
+use function app;
 use BookStack\Actions\Activity;
 use BookStack\Actions\ActivityLogger;
 use BookStack\Actions\ActivityType;
@@ -11,9 +12,8 @@ use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;
 use Carbon\Carbon;
-use Tests\TestCase;
-use function app;
 use function config;
+use Tests\TestCase;
 
 class AuditLogTest extends TestCase
 {

tests/Actions/WebhookCallTest.php

@@ -15,7 +15,6 @@ use Tests\TestCase;
 
 class WebhookCallTest extends TestCase
 {
-
     public function test_webhook_listening_to_all_called_on_event()
     {
         $this->newWebhook([], ['all']);
@@ -73,8 +72,9 @@ class WebhookCallTest extends TestCase
 
         $this->runEvent(ActivityType::PAGE_UPDATE, $page, $editor);
 
-        Http::assertSent(function(Request $request) use ($editor, $page, $webhook) {
+        Http::assertSent(function (Request $request) use ($editor, $page, $webhook) {
             $reqData = $request->data();
+
             return $request->isJson()
                 && $reqData['event'] === 'page_update'
                 && $reqData['text'] === ($editor->name . ' updated page "' . $page->name . '"')
@@ -88,7 +88,6 @@ class WebhookCallTest extends TestCase
         });
     }
 
-
     protected function runEvent(string $event, $detail = '', ?User $user = null)
     {
         if (is_null($user)) {
@@ -112,5 +111,4 @@ class WebhookCallTest extends TestCase
 
         return $webhook;
     }
-
 }

tests/Actions/WebhookManagementTest.php

@@ -8,7 +8,6 @@ use Tests\TestCase;
 
 class WebhookManagementTest extends TestCase
 {
-
     public function test_index_view()
     {
         $webhook = $this->newWebhook([
@@ -39,7 +38,7 @@ class WebhookManagementTest extends TestCase
             'name'     => 'My first webhook',
             'endpoint' => 'https://example.com/webhook',
             'events'   => ['all'],
-            'active' => 'true'
+            'active'   => 'true',
         ]);
 
         $resp->assertRedirect('/settings/webhooks');
@@ -82,7 +81,7 @@ class WebhookManagementTest extends TestCase
             'name'     => 'My updated webhook',
             'endpoint' => 'https://example.com/updated-webhook',
             'events'   => [ActivityType::PAGE_CREATE, ActivityType::PAGE_UPDATE],
-            'active' => 'true'
+            'active'   => 'true',
         ]);
         $resp->assertRedirect('/settings/webhooks');
 
@@ -169,5 +168,4 @@ class WebhookManagementTest extends TestCase
 
         return $webhook;
     }
-
 }

tests/Entity/EntitySearchTest.php

@@ -407,7 +407,7 @@ class EntitySearchTest extends TestCase
     {
         $this->newPage([
             'name' => 'Test Page',
-            'html' => '<p>На мен ми трябва нещо добро test</p>'
+            'html' => '<p>На мен ми трябва нещо добро test</p>',
         ]);
 
         $search = $this->asEditor()->get('/search?term=' . urlencode('На мен ми трябва нещо добро'));