archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-15 17:24:11 +00:00
Code Issues Projects Releases Wiki Activity

Applied latest styleci changes

Browse source
This commit is contained in:
Dan Brown 2021-10-15 14:16:45 +01:00
parent 747f81d5d8
commit f3c147d33b
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
4 changed files with 17 additions and 17 deletions

5
app/Exceptions/WhoopsBookStackPrettyHandler.php
View file

@ -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
*/
@ -24,7 +23,8 @@ class WhoopsBookStackPrettyHandler extends Handler
return Handler::QUIT;
}
protected function safeReturn(callable $callback, $default = null) {
protected function safeReturn(callable $callback, $default = null)
{
try {
return $callback();
} catch (\Exception $e) {
@ -38,6 +38,7 @@ class WhoopsBookStackPrettyHandler extends Handler
'PHP Version' => phpversion(),
'BookStack Version' => $this->safeReturn(function () {
$versionFile = base_path('version');
return trim(file_get_contents($versionFile));
}, 'unknown'),
'Theme Configured' => $this->safeReturn(function () {

4
tests/Auth/MfaConfigurationTest.php
View file

@ -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');
}
}

3
tests/DebugViewTest.php
View file

@ -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');
}
}