From 6497f6bf906109f86ab999f41c4745da44702cfa Mon Sep 17 00:00:00 2001 From: IceToast Date: Sun, 2 Apr 2023 19:57:28 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=94=A5=20Removed=20default=20value?= =?UTF-8?q?s=20from=20Settings=20class=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Settings/DiscordSettings.php | 5 ----- app/Settings/GeneralSettings.php | 4 ++-- app/Settings/InvoiceSettings.php | 9 +-------- app/Settings/LocaleSettings.php | 8 ++------ app/Settings/MailSettings.php | 10 +--------- app/Settings/PterodactylSettings.php | 3 --- app/Settings/ReferralSettings.php | 9 ++------- app/Settings/ServerSettings.php | 9 +++------ app/Settings/TicketSettings.php | 3 +-- app/Settings/UserSettings.php | 19 ++++--------------- app/Settings/WebsiteSettings.php | 16 ++++++---------- 11 files changed, 22 insertions(+), 73 deletions(-) diff --git a/app/Settings/DiscordSettings.php b/app/Settings/DiscordSettings.php index ecb35c07..8671fa8a 100644 --- a/app/Settings/DiscordSettings.php +++ b/app/Settings/DiscordSettings.php @@ -7,15 +7,10 @@ use Spatie\LaravelSettings\Settings; class DiscordSettings extends Settings { public ?string $bot_token; - public ?string $client_id; - public ?string $client_secret; - public ?string $guild_id; - public ?string $invite_url; - public ?string $role_id; public static function group(): string diff --git a/app/Settings/GeneralSettings.php b/app/Settings/GeneralSettings.php index 3fbf85c3..02f8767f 100644 --- a/app/Settings/GeneralSettings.php +++ b/app/Settings/GeneralSettings.php @@ -6,13 +6,13 @@ use Spatie\LaravelSettings\Settings; class GeneralSettings extends Settings { - public bool $store_enabled = false; + public bool $store_enabled; public string $credits_display_name; public bool $recaptcha_enabled; public string $recaptcha_site_key; public string $recaptcha_secret_key; public string $phpmyadmin_url; - public bool $alert_enabled = false; + public bool $alert_enabled; public string $alert_type; public string $alert_message; public string $theme; diff --git a/app/Settings/InvoiceSettings.php b/app/Settings/InvoiceSettings.php index 5bcb65c4..46dce9c5 100644 --- a/app/Settings/InvoiceSettings.php +++ b/app/Settings/InvoiceSettings.php @@ -7,19 +7,12 @@ use Spatie\LaravelSettings\Settings; class InvoiceSettings extends Settings { public ?string $company_address; - public ?string $company_mail; - public ?string $company_name; - public ?string $company_phone; - public ?string $company_vat; - public ?string $company_website; - - public bool $enabled = false; - + public bool $enabled; public ?string $prefix; public static function group(): string diff --git a/app/Settings/LocaleSettings.php b/app/Settings/LocaleSettings.php index 916e1436..7802f499 100644 --- a/app/Settings/LocaleSettings.php +++ b/app/Settings/LocaleSettings.php @@ -7,14 +7,10 @@ use Spatie\LaravelSettings\Settings; class LocaleSettings extends Settings { public ?string $available; - - public bool $clients_can_change = false; - + public bool $clients_can_change; public ?string $datatables; - public string $default; - - public bool $dynamic = false; + public bool $dynamic; public static function group(): string { diff --git a/app/Settings/MailSettings.php b/app/Settings/MailSettings.php index 76cc9891..e94953ce 100644 --- a/app/Settings/MailSettings.php +++ b/app/Settings/MailSettings.php @@ -7,22 +7,14 @@ use Spatie\LaravelSettings\Settings; class MailSettings extends Settings { public ?string $mail_host; - public ?int $mail_port; - public ?string $mail_username; - public ?string $mail_password; - public ?string $mail_encryption; - public ?string $mail_from_address; - public ?string $mail_from_name; - public ?string $mail_mailer; - - public bool $mail_enabled = false; + public bool $mail_enabled; public static function group(): string { diff --git a/app/Settings/PterodactylSettings.php b/app/Settings/PterodactylSettings.php index 11f1b006..2267152e 100644 --- a/app/Settings/PterodactylSettings.php +++ b/app/Settings/PterodactylSettings.php @@ -7,11 +7,8 @@ use Spatie\LaravelSettings\Settings; class PterodactylSettings extends Settings { public string $admin_token; - public string $user_token; - public string $panel_url; - public int $per_page_limit; public static function group(): string diff --git a/app/Settings/ReferralSettings.php b/app/Settings/ReferralSettings.php index 892a2132..b85d453e 100644 --- a/app/Settings/ReferralSettings.php +++ b/app/Settings/ReferralSettings.php @@ -7,15 +7,10 @@ use Spatie\LaravelSettings\Settings; class ReferralSettings extends Settings { public string $allowed; - - public bool $always_give_commission = false; - - public bool $enabled = false; - + public bool $always_give_commission; + public bool $enabled; public ?float $reward; - public string $mode; - public ?int $percentage; public static function group(): string diff --git a/app/Settings/ServerSettings.php b/app/Settings/ServerSettings.php index a658a206..ee43e667 100644 --- a/app/Settings/ServerSettings.php +++ b/app/Settings/ServerSettings.php @@ -7,12 +7,9 @@ use Spatie\LaravelSettings\Settings; class ServerSettings extends Settings { public int $allocation_limit; - - public bool $creation_enabled = false; - - public bool $enable_upgrade = false; - - public bool $charge_first_hour = false; + public bool $creation_enabled; + public bool $enable_upgrade; + public bool $charge_first_hour; public static function group(): string { diff --git a/app/Settings/TicketSettings.php b/app/Settings/TicketSettings.php index aa6e879d..10ac16b1 100644 --- a/app/Settings/TicketSettings.php +++ b/app/Settings/TicketSettings.php @@ -6,8 +6,7 @@ use Spatie\LaravelSettings\Settings; class TicketSettings extends Settings { - public bool $enabled = false; - + public bool $enabled; public string $notify; public static function group(): string diff --git a/app/Settings/UserSettings.php b/app/Settings/UserSettings.php index 0c3a43bf..ec34f678 100644 --- a/app/Settings/UserSettings.php +++ b/app/Settings/UserSettings.php @@ -7,28 +7,17 @@ use Spatie\LaravelSettings\Settings; class UserSettings extends Settings { public float $credits_reward_after_verify_discord; - public float $credits_reward_after_verify_email; - - public bool $force_discord_verification = false; - - public bool $force_email_verification = false; - + public bool $force_discord_verification; + public bool $force_email_verification; public float $initial_credits; - public int $initial_server_limit; - public float $min_credits_to_make_server; - public int $server_limit_after_irl_purchase; - public int $server_limit_after_verify_discord; - public int $server_limit_after_verify_email; - - public bool $register_ip_check = false; - - public bool $creation_enabled = false; + public bool $register_ip_check; + public bool $creation_enabled; public static function group(): string { diff --git a/app/Settings/WebsiteSettings.php b/app/Settings/WebsiteSettings.php index 2d65483b..e557fd93 100644 --- a/app/Settings/WebsiteSettings.php +++ b/app/Settings/WebsiteSettings.php @@ -8,18 +8,14 @@ class WebsiteSettings extends Settings { - public bool $show_imprint = false; - - public bool $show_privacy = false; - - public bool $show_tos = false; - - public bool $useful_links_enabled = false; - public bool $enable_login_logo = false; + public bool $show_imprint; + public bool $show_privacy; + public bool $show_tos; + public bool $useful_links_enabled; + public bool $enable_login_logo; public ?string $seo_title; - public ?string $seo_description; - public bool $motd_enabled = false; + public bool $motd_enabled; public ?string $motd_message;