admin/imail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: auto-refactor via rector

Browse Source
This commit is contained in:
idevakk
2025-10-02 22:37:58 +05:30
parent d3bf62375a
commit 28e36c47e3
5 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Providers/DynamicMailConfigServiceProvider.php
View File

@@ -14,11 +14,11 @@ class DynamicMailConfigServiceProvider extends ServiceProvider
// Mail configuration properties
private string $mailDriver;
private ?string $mailScheme;
private ?string $mailScheme = null;
private string $mailHost;
private string $mailPort;
private ?string $mailUsername;
private ?string $mailPassword;
private ?string $mailUsername = null;
private ?string $mailPassword = null;
private string $mailFromAddress;
private string $mailFromName;
private int $mailTimeout;
@@ -65,9 +65,10 @@ class DynamicMailConfigServiceProvider extends ServiceProvider
private function loadConfiguration(): void
{
try {
$this->mailConfig = DbConfig::getGroup('mail') ?: [];
$group = DbConfig::getGroup('mail');
$this->mailConfig = (in_array($group, [null, []], true)) ? [] : $group;
$this->mailConfig['app_url'] = db_config('website.site_url') ?? env('APP_URL', 'http://localhost');
} catch (\Throwable $e) {
} catch (\Throwable) {
Log::warning('Database mail configuration unavailable; falling back to env values.');
$this->mailConfig = ['app_url' => env('APP_URL', 'http://localhost')];
}
@@ -83,7 +84,7 @@ class DynamicMailConfigServiceProvider extends ServiceProvider
$this->mailFromName = $this->getConfig('mail_from_name', env('MAIL_FROM_NAME', 'Example'));
$this->mailFromAddress = $this->getConfig('mail_from_address', env('MAIL_FROM_ADDRESS', 'hello@example.com'));
$this->mailTimeout = $this->getConfig('mail_timeout', env('MAIL_TIMEOUT', 15));
$this->mailEHLO = $this->getConfig('mail_ehlo', env('MAIL_EHLO', parse_url((string) $this->appUrl, PHP_URL_HOST)));
$this->mailEHLO = $this->getConfig('mail_ehlo', env('MAIL_EHLO', parse_url($this->appUrl, PHP_URL_HOST)));
}
private function getConfig(string $key, $default = null)

25
app/Providers/Filament/DashPanelProvider.php
View File

@@ -49,7 +49,7 @@ class DashPanelProvider extends PanelProvider
private bool $panelBrandLogoShow;
private string $panelBrandLogoLight;
private string $panelBrandLogoDark;
private ?string $panelBrandLogoHeight;
private ?string $panelBrandLogoHeight = null;
private string $panelFavicon;
// MFA configuration properties
@@ -108,7 +108,10 @@ class DashPanelProvider extends PanelProvider
FilamentLogViewerPlugin::make(),
FilamentMailsPlugin::make()->canManageMails(function (): bool {
$user = Auth::user();
return $user->hasRole('admin') || $user->hasPermissionTo('manage mails');
if ($user->hasRole('admin')) {
return true;
}
return (bool) $user->hasPermissionTo('manage mails');
}),
])
->routes(fn() => FilamentMails::routes());
@@ -121,10 +124,10 @@ class DashPanelProvider extends PanelProvider
private function loadConfiguration(): void
{
try {
$this->panelConfig = DbConfig::getGroup('panel');
$group = DbConfig::getGroup('panel');
$this->panelConfig = (in_array($group, [null, []], true)) ? [] : $group;
} catch (\Exception $e) {
Log::error($e->getMessage());
$this->panelConfig = [];
}
// Load basic panel configuration
@@ -166,14 +169,14 @@ class DashPanelProvider extends PanelProvider
private function applyConditionalConfiguration(Panel $panel): void
{
$actions = [
'login' => [$this->panelLogin, fn() => $panel->login()],
'register' => [$this->panelRegistration, fn() => $panel->registration()],
'profile' => [$this->panelProfile, fn() => $panel->profile()],
'spa' => [$this->panelSPA, fn() => $panel
'login' => [$this->panelLogin, fn(): \Filament\Panel => $panel->login()],
'register' => [$this->panelRegistration, fn(): \Filament\Panel => $panel->registration()],
'profile' => [$this->panelProfile, fn(): \Filament\Panel => $panel->profile()],
'spa' => [$this->panelSPA, fn(): \Filament\Panel => $panel
->spa(hasPrefetching: $this->panelSPAPrefetch)
->spaUrlExceptions(exceptions: $this->panelSPAExceptions)
],
'logo' => [$this->panelBrandLogoShow, fn() => $panel
'logo' => [$this->panelBrandLogoShow, fn(): \Filament\Panel => $panel
->brandLogo(asset($this->panelBrandLogoLight))
->darkModeBrandLogo(asset($this->panelBrandLogoDark))
->brandLogoHeight($this->panelBrandLogoHeight)
@@ -181,7 +184,9 @@ class DashPanelProvider extends PanelProvider
];
foreach ($actions as [$condition, $callback]) {
$condition && $callback();
if ($condition) {
$callback();
}
}
$this->configureMFA($panel);