Applied latest styleci changes

ssddanbrown · ssddanbrown · commit f3c147d33bc3 · 2021-10-15T14:16:45.000+01:00
diff --git a/app/Exceptions/WhoopsBookStackPrettyHandler.php b/app/Exceptions/WhoopsBookStackPrettyHandler.php
@@ -6,7 +6,6 @@
 
 class WhoopsBookStackPrettyHandler extends Handler
 {
-
     /**
      * @return int|null A handler may return nothing, or a Handler::HANDLE_* constant
      */
@@ -15,16 +14,17 @@ public function handle()
         $exception = $this->getException();
 
         echo view('errors.debug', [
-            'error' => $exception->getMessage(),
-            'errorClass' => get_class($exception),
-            'trace' => $exception->getTraceAsString(),
+            'error'       => $exception->getMessage(),
+            'errorClass'  => get_class($exception),
+            'trace'       => $exception->getTraceAsString(),
             'environment' => $this->getEnvironment(),
         ])->render();
 
         return Handler::QUIT;
     }
 
-    protected function safeReturn(callable $callback, $default = null) {
+    protected function safeReturn(callable $callback, $default = null)
+    {
         try {
             return $callback();
         } catch (\Exception $e) {
@@ -35,14 +35,15 @@ protected function safeReturn(callable $callback, $default = null) {
     protected function getEnvironment(): array
     {
         return [
-            'PHP Version' => phpversion(),
-            'BookStack Version' => $this->safeReturn(function() {
+            'PHP Version'       => phpversion(),
+            'BookStack Version' => $this->safeReturn(function () {
                 $versionFile = base_path('version');
+
                 return trim(file_get_contents($versionFile));
             }, 'unknown'),
-            'Theme Configured' => $this->safeReturn(function() {
-                    return config('view.theme');
-                }) ?? 'None',
+            'Theme Configured' => $this->safeReturn(function () {
+                return config('view.theme');
+            }) ?? 'None',
         ];
     }
-}
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -67,7 +67,7 @@ public function boot()
      */
     public function register()
     {
-        $this->app->bind(HandlerInterface::class, function($app) {
+        $this->app->bind(HandlerInterface::class, function ($app) {
             return $app->make(WhoopsBookStackPrettyHandler::class);
         });
 
diff --git a/tests/Auth/MfaConfigurationTest.php b/tests/Auth/MfaConfigurationTest.php
@@ -180,7 +180,7 @@ public function test_totp_setup_url_shows_correct_user_when_setup_forced_upon_lo
 
         $resp = $this->get('/mfa/totp/generate');
         $resp->assertSeeText('Mobile App Setup');
-        $resp->assertDontSee("otpauth://totp/BookStack:guest%40example.com");
-        $resp->assertSee("otpauth://totp/BookStack:admin%40admin.com");
+        $resp->assertDontSee('otpauth://totp/BookStack:guest%40example.com');
+        $resp->assertSee('otpauth://totp/BookStack:admin%40admin.com');
     }
 }
diff --git a/tests/DebugViewTest.php b/tests/DebugViewTest.php
@@ -42,13 +42,12 @@ public function test_debug_view_only_shows_when_debug_mode_is_enabled()
         $resp->assertSeeText('An unknown error occurred');
     }
 
-
     protected function getDebugViewForException(\Exception $exception): TestResponse
     {
         // Fake an error via social auth service used on login page
         $mockService = $this->mock(SocialAuthService::class);
         $mockService->shouldReceive('getActiveDrivers')->andThrow($exception);
+
         return $this->get('/login');
     }
-
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function boot()`
`67`	`67`	`*/`
`68`	`68`	`public function register()`
`69`	`69`	`{`
`70`		`- $this->app->bind(HandlerInterface::class, function($app) {`
	`70`	`+ $this->app->bind(HandlerInterface::class, function ($app) {`
`71`	`71`	`return $app->make(WhoopsBookStackPrettyHandler::class);`
`72`	`72`	`});`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function test_totp_setup_url_shows_correct_user_when_setup_forced_upon_lo`
`180`	`180`
`181`	`181`	`$resp = $this->get('/mfa/totp/generate');`
`182`	`182`	`$resp->assertSeeText('Mobile App Setup');`
`183`		`- $resp->assertDontSee("otpauth://totp/BookStack:guest%40example.com");`
`184`		`- $resp->assertSee("otpauth://totp/BookStack:admin%40admin.com");`
	`183`	`+ $resp->assertDontSee('otpauth://totp/BookStack:guest%40example.com');`
	`184`	`+ $resp->assertSee('otpauth://totp/BookStack:admin%40admin.com');`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,12 @@ public function test_debug_view_only_shows_when_debug_mode_is_enabled()`
`42`	`42`	`$resp->assertSeeText('An unknown error occurred');`
`43`	`43`	`}`
`44`	`44`
`45`		`-`
`46`	`45`	`protected function getDebugViewForException(\Exception $exception): TestResponse`
`47`	`46`	`{`
`48`	`47`	`// Fake an error via social auth service used on login page`
`49`	`48`	`$mockService = $this->mock(SocialAuthService::class);`
`50`	`49`	`$mockService->shouldReceive('getActiveDrivers')->andThrow($exception);`
	`50`	`+`
`51`	`51`	`return $this->get('/login');`
`52`	`52`	`}`
`53`		`-`
`54`		`-}`
	`53`	`+}`