1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00

Updated php deps and applied styleci changes

This commit is contained in:
Dan Brown
2022-06-22 12:49:58 +01:00
parent 8d8da31fdd
commit 46d71a181e
3 changed files with 69 additions and 73 deletions

View File

@@ -6,13 +6,12 @@ use Tests\TestCase;
class LoginAutoInitiateTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
config()->set([
'auth.auto_initiate' => true,
'auth.auto_initiate' => true,
'services.google.client_id' => false,
'services.github.client_id' => false,
]);
@@ -45,8 +44,8 @@ class LoginAutoInitiateTest extends TestCase
public function test_it_does_not_run_if_social_provider_is_active()
{
config()->set([
'auth.method' => 'oidc',
'services.google.client_id' => 'abc123a',
'auth.method' => 'oidc',
'services.google.client_id' => 'abc123a',
'services.google.client_secret' => 'def456',
]);
@@ -76,5 +75,4 @@ class LoginAutoInitiateTest extends TestCase
$req = $this->post('/logout');
$req->assertRedirect('/login?prevent_auto_init=true');
}
}
}

View File

@@ -17,7 +17,6 @@ use Illuminate\Http\Response;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Str;
use League\CommonMark\ConfigurableEnvironmentInterface;
class ThemeTest extends TestCase
@@ -260,7 +259,7 @@ class ThemeTest extends TestCase
$bodyStartStr = 'barry-fought-against-the-panther';
$bodyEndStr = 'barry-lost-his-fight-with-grace';
$this->usingThemeFolder(function(string $folder) use ($bodyStartStr, $bodyEndStr) {
$this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr) {
$viewDir = theme_path('layouts/parts');
mkdir($viewDir, 0777, true);
file_put_contents($viewDir . '/base-body-start.blade.php', $bodyStartStr);
@@ -281,7 +280,7 @@ class ThemeTest extends TestCase
File::makeDirectory($themeFolderPath);
// Run provided callback with theme env option set
$this->runWithEnv('APP_THEME', $themeFolderName, function() use ($callback, $themeFolderName) {
$this->runWithEnv('APP_THEME', $themeFolderName, function () use ($callback, $themeFolderName) {
call_user_func($callback, $themeFolderName);
});