Applied styleci patches

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 2d85c870df2052b88b575eeaea4dd1fdc354fb56..1733d29b358bc930489491874d361c67a11ae108 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -48,7 +48,7 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
-        'can'       => \BookStack\Http\Middleware\CheckUserHasPermission::class,
+        'can'        => \BookStack\Http\Middleware\CheckUserHasPermission::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'guard'      => \BookStack\Http\Middleware\CheckGuard::class,

diff --git a/app/Http/Middleware/CheckUserHasPermission.php b/app/Http/Middleware/CheckUserHasPermission.php
index 4340152e7cb16f7490d68ca72b5d38f44dd6fde7..4a6a06468d17e025aa2545dd0f7769237acd6cca 100644 (file)
--- a/app/Http/Middleware/CheckUserHasPermission.php
+++ b/app/Http/Middleware/CheckUserHasPermission.php
@@ -25,7 +25,6 @@ class CheckUserHasPermission
         return $next($request);
     }
 
-
     protected function errorResponse(Request $request)
     {
         if ($request->wantsJson()) {
@@ -33,6 +32,7 @@ class CheckUserHasPermission
         }
 
         session()->flash('error', trans('errors.permission'));
+
         return redirect('/');
     }
 }

diff --git a/database/migrations/2021_08_28_161743_add_export_role_permission.php b/database/migrations/2021_08_28_161743_add_export_role_permission.php
index 57abea070bd4a6100b73fee654a53e72c715522f..184c24ecf533bde7aa0647e24735095085b664d5 100644 (file)
--- a/database/migrations/2021_08_28_161743_add_export_role_permission.php
+++ b/database/migrations/2021_08_28_161743_add_export_role_permission.php
@@ -15,15 +15,15 @@ class AddExportRolePermission extends Migration
         // Create new templates-manage permission and assign to admin role
         $roles = \Illuminate\Support\Facades\DB::table('roles')->get('id');
         $permissionId = DB::table('role_permissions')->insertGetId([
-            'name' => 'content-export',
+            'name'         => 'content-export',
             'display_name' => 'Export Content',
-            'created_at' => Carbon::now()->toDateTimeString(),
-            'updated_at' => Carbon::now()->toDateTimeString(),
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
         ]);
 
         $permissionRoles = $roles->map(function ($role) use ($permissionId) {
             return [
-                'role_id' => $role->id,
+                'role_id'       => $role->id,
                 'permission_id' => $permissionId,
             ];
         })->values()->toArray();

diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 32077aebc5740d01faaa5fb9871e58726502ac40..7031c3875a77edb925527d4dc4cd272d18111e55 100644 (file)
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -353,7 +353,7 @@ class ExportTest extends TestCase
 
         foreach ($entities as $entity) {
             $resp = $this->get($entity->getUrl());
-            $resp->assertSee("/export/pdf");
+            $resp->assertSee('/export/pdf');
         }
 
         /** @var Role $role */
@@ -361,8 +361,8 @@ class ExportTest extends TestCase
 
         foreach ($entities as $entity) {
             $resp = $this->get($entity->getUrl());
-            $resp->assertDontSee("/export/pdf");
-            $resp = $this->get($entity->getUrl("/export/pdf"));
+            $resp->assertDontSee('/export/pdf');
+            $resp = $this->get($entity->getUrl('/export/pdf'));
             $this->assertPermissionError($resp);
         }
     }