Skip to content

Add optional config migration for themes (#526) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AzariasB merged 1 commit into from
Mar 9, 2026
Merged

Add optional config migration for themes (#526) #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 29 additions & 5 deletions app/Http/Controllers/Admin/ThemeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,16 @@ public function update(string $theme)

if ($oldConfig !== null) {
$newConfig = $this->themes->readConfig($theme) ?? [];
$migratePath = $this->themes->path('config/migrate.php', $theme);
$mergeStrategy = $this->files->exists($migratePath)
? $this->files->getRequire($migratePath)
: null;

$this->themes->updateConfig($theme, array_merge($newConfig, $oldConfig));
$mergedConfig = is_callable($mergeStrategy)
? $mergeStrategy($oldConfig, $newConfig)
: array_merge($newConfig, $oldConfig);

$this->themes->updateConfig($theme, $mergedConfig);
}

if ($this->themes->isLegacy($theme)) {
Expand Down Expand Up @@ -210,12 +218,28 @@ public function changeTheme($theme = null)
->with('success', trans('admin.themes.updated'));
}

protected static function appendConfig(array $config, array $replacement)
protected static function appendConfig(array $config, array $replacement): array
{
foreach ($replacement as $key => $value) {
$config[$key] = is_array($value)
? static::appendConfig($config[$key], $value)
: $value;
if (! is_array($value)) {
$config[$key] = $value;
continue;
}

// Replace instead of merge when `$replace` key is set to true
if ($value['$replace'] ?? false) {
unset($value['$replace']);
$config[$key] = $value;
continue;
}

// Replace numeric arrays (lists) instead of merging
if (array_is_list($value)) {
$config[$key] = $value;
continue;
}

$config[$key] = static::appendConfig($config[$key] ?? [], $value);
}

return $config;
Expand Down