From 0994173b1b15de2d05a0c29c57076f5da717309c Mon Sep 17 00:00:00 2001 From: ildyria Date: Sat, 27 Aug 2022 14:40:28 +0200 Subject: [PATCH] WRTC --- app/Models/Configs.php | 2 +- database/migrations/2020_12_12_203153_migrate_admin_user.php | 2 +- tests/Feature/InstallTest.php | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Models/Configs.php b/app/Models/Configs.php index 25ddc96503..fec1143679 100644 --- a/app/Models/Configs.php +++ b/app/Models/Configs.php @@ -302,7 +302,7 @@ public function scopeAdmin(FixedQueryBuilder $query): FixedQueryBuilder /** * Reset the cache. */ - public static function dropCache(): void + public static function invalidateCache(): void { self::$cache = []; } diff --git a/database/migrations/2020_12_12_203153_migrate_admin_user.php b/database/migrations/2020_12_12_203153_migrate_admin_user.php index 48c3ee2293..75a9b792e7 100644 --- a/database/migrations/2020_12_12_203153_migrate_admin_user.php +++ b/database/migrations/2020_12_12_203153_migrate_admin_user.php @@ -21,7 +21,7 @@ public function up(): void $user = User::query()->findOrNew(0); $user->incrementing = false; // disable auto-generation of ID $user->id = 0; - Configs::dropCache(); + Configs::invalidateCache(); $user->username = Configs::getValueAsString('username', ''); $user->password = Configs::getValueAsString('password', ''); $user->save(); diff --git a/tests/Feature/InstallTest.php b/tests/Feature/InstallTest.php index cd53737887..c4ac9bd88c 100644 --- a/tests/Feature/InstallTest.php +++ b/tests/Feature/InstallTest.php @@ -50,7 +50,6 @@ public function testInstall(): void * Clearing things up. We could do an Artisan migrate but this is more efficient. */ - Schema::disableForeignKeyConstraints(); $tables = [ 'sym_links', 'size_variants', @@ -80,7 +79,6 @@ public function testInstall(): void foreach ($tables as $table) { Schema::dropIfExists($table); } - Schema::enableForeignKeyConstraints(); /** * No database: we should be redirected to install: default case. @@ -142,7 +140,7 @@ public function testInstall(): void /** * We now should NOT be redirected. */ - Configs::dropCache(); + Configs::invalidateCache(); $response = $this->get('/'); $response->assertOk();