Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions core/tests/Feature/SiteUpdateE2ETest.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ class_alias(\Illuminate\Support\Facades\Schema::class, 'Schema');
/**
* Create and seed a database that mirrors a site installed at "version N":
* a healthy ACL baseline, legacy permission keys that the update seeder renames,
* and an existing (outdated) bundled Extras module — but no system task tables.
* and an existing (outdated) bundled Extras module — but no system task tables
* or settings that older CLI installers omitted.
*/
function seedVersionNDatabase(Capsule $capsule): void
{
Expand Down Expand Up @@ -139,6 +140,10 @@ function seedVersionNDatabase(Capsule $capsule): void
$table->increments('id');
$table->string('name')->nullable();
});
$schema->create('system_settings', function (Blueprint $table) {
$table->string('setting_name', 50)->primary();
$table->text('setting_value')->nullable();
});

$db = $capsule->getConnection();

Expand Down Expand Up @@ -209,7 +214,9 @@ public function applyExtrasModule(): void

// Pre-state sanity: version "N" has no system task tables and legacy permission keys.
expect($db->getSchemaBuilder()->hasTable('system_cli_tasks'))->toBeFalse()
->and($db->table('permissions')->where('key', 'logout')->exists())->toBeTrue();
->and($db->table('permissions')->where('key', 'logout')->exists())->toBeTrue()
->and($db->table('system_settings')->where('setting_name', 'site_id')->exists())->toBeFalse()
->and($db->table('system_settings')->where('setting_name', 'manager_theme')->exists())->toBeFalse();

runSiteUpdateDatabaseSteps();

Expand All @@ -233,6 +240,18 @@ public function applyExtrasModule(): void
->and($db->table('role_permissions')->where('permission', 'widget_recent_info')->exists())->toBeTrue()
->and($db->table('role_permissions')->where('permission', 'manage_groups')->exists())->toBeTrue();

// Older CLI installers omitted these settings. The update repairs them,
// and subsequent updates preserve the site's established values.
$siteId = $db->table('system_settings')->where('setting_name', 'site_id')->value('setting_value');
expect($siteId)->toBeString()->not->toBe('')
->and($db->table('system_settings')->where('setting_name', 'manager_theme')->value('setting_value'))->toBe('default');

$db->table('system_settings')->where('setting_name', 'manager_theme')->update(['setting_value' => 'custom']);
(new \EvolutionCMS\Installer\Update\SystemSettingsTableSeeder())->run();

expect($db->table('system_settings')->where('setting_name', 'site_id')->value('setting_value'))->toBe($siteId)
->and($db->table('system_settings')->where('setting_name', 'manager_theme')->value('setting_value'))->toBe('custom');

// Bundled Extras module refreshed from install/assets/modules/store.tpl.
$extras = $db->table('site_modules')->where('name', 'Extras')->first();
expect($extras->description)->toContain('<strong>0.2.0</strong>')
Expand Down
33 changes: 33 additions & 0 deletions install/stubs/seeds/update/SystemSettingsTableSeeder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php namespace EvolutionCMS\Installer\Update;

use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

class SystemSettingsTableSeeder extends Seeder
{
/**
* Backfill settings omitted by older CLI installations without replacing
* values already chosen by the site operator.
*/
public function run(): void
{
$this->setWhenEmpty('site_id', uniqid(''));
$this->setWhenEmpty('manager_theme', 'default');
}

private function setWhenEmpty(string $name, string $value): void
{
$current = DB::table('system_settings')
->where('setting_name', $name)
->value('setting_value');

if (is_string($current) && $current !== '') {
return;
}

DB::table('system_settings')->updateOrInsert(
['setting_name' => $name],
['setting_value' => $value]
);
}
}