Skip to content
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

fix: setting key safe_mode_extensions not exists #3992

Merged
merged 1 commit into from
May 18, 2024
Merged

fix: setting key safe_mode_extensions not exists #3992

Show file tree
Hide file tree
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
14 changes: 9 additions & 5 deletions framework/core/src/Admin/WhenSavingSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,18 @@ public function beforeSave(Saving $event): void
{
if (array_key_exists('safe_mode_extensions', $event->settings)) {
$safeModeExtensions = json_decode($event->settings['safe_mode_extensions'] ?? '[]', true);
$sorted = [];

$extensions = $this->extensions->getExtensions()->filter(function ($extension) use ($safeModeExtensions) {
return in_array($extension->getId(), $safeModeExtensions);
});
if ($safeModeExtensions) {
$extensions = $this->extensions->getExtensions()->filter(function ($extension) use ($safeModeExtensions) {
return in_array($extension->getId(), $safeModeExtensions);
});

$sorted = array_map(fn (Extension $e) => $e->getId(), $this->extensions->sortDependencies($extensions->all()));
$sorted = array_map(fn (Extension $e) => $e->getId(), $this->extensions->sortDependencies($extensions->all()));
$sorted = array_values($sorted);
}

$event->settings['safe_mode_extensions'] = json_encode(array_values($sorted));
$event->settings['safe_mode_extensions'] = json_encode($sorted);
}
Comment on lines 38 to 51
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this part throw an error like the config one? I would assume it wouldn't since we do $event->settings['safe_mode_extensions'] ?? '[]' here 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

safe_mode_extensions always includes in Saving event with empty value (safe_mode_extensions : "" in the Advanced page, so it doesn't cause errors here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may looks like this

// $event->settings['safe_mode_extensions'] is '' if no extensions selected
$safeModeExtensions = ! empty($event->settings['safe_mode_extensions']) ? $event->settings['safe_mode_extensions'] : '[]';
$safeModeExtensions = json_decode($event->settings['safe_mode_extensions'], true);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that makes sense!

}

Expand Down
2 changes: 1 addition & 1 deletion framework/core/src/Foundation/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function maintenanceMode(): string

public function safeModeExtensions(): ?array
{
return $this->data['safe_mode_extensions'];
return $this->data['safe_mode_extensions'] ?? null;
}

private function requireKeys(mixed ...$keys): void
Expand Down
Loading