Applied latest styleci changes

diff --git a/app/Exceptions/WhoopsBookStackPrettyHandler.php b/app/Exceptions/WhoopsBookStackPrettyHandler.php
index 22a49e04af846075bae3510e4e3701b4193f4b04..dcf50fa8e465e07d36180bfb38b42028402c97e2 100644 (file)
--- a/app/Exceptions/WhoopsBookStackPrettyHandler.php
+++ b/app/Exceptions/WhoopsBookStackPrettyHandler.php
@@ -6,7 +6,6 @@ use Whoops\Handler\Handler;
 
 class WhoopsBookStackPrettyHandler extends Handler
 {
-
     /**
      * @return int|null A handler may return nothing, or a Handler::HANDLE_* constant
      */
@@ -15,16 +14,17 @@ class WhoopsBookStackPrettyHandler extends Handler
         $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 @@ class WhoopsBookStackPrettyHandler extends Handler
     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',
         ];
     }
-}
\ No newline at end of file
+}

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 0316b02aacc9a3bfc9be853334254becea778439..4446c2a0a04aba5f706e9ecc6ff14fe8d4f88167 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -67,7 +67,7 @@ class AppServiceProvider extends ServiceProvider
      */
     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
index 4223d052dac877cdc81f8478369506fec9311364..59a2a41b5652ee7c2c7e423eab3e8b27d4a8a6cd 100644 (file)
--- a/tests/Auth/MfaConfigurationTest.php
+++ b/tests/Auth/MfaConfigurationTest.php
@@ -180,7 +180,7 @@ class MfaConfigurationTest extends TestCase
 
         $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
index 3485b4598e77103d97049219fe15de00cd905528..63d6472b982c7d3efc5b12df538050485f4569a5 100644 (file)
--- a/tests/DebugViewTest.php
+++ b/tests/DebugViewTest.php
@@ -42,13 +42,12 @@ class DebugViewTest extends TestCase
         $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');
     }
-
-}
\ No newline at end of file
+}