From 7b29ee8ebf449aa0ee69903086b2f95e192f057c Mon Sep 17 00:00:00 2001 From: paulwer Date: Sun, 7 Apr 2024 16:30:04 +0200 Subject: [PATCH] remove unused variables from ExpenseMailbox check --- app/Http/Requests/Company/StoreCompanyRequest.php | 2 +- app/Http/Requests/Company/UpdateCompanyRequest.php | 2 +- app/Http/ValidationRules/Company/ValidExpenseMailbox.php | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index ff09dbfacc07..e9b5c50b8a43 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -57,7 +57,7 @@ class StoreCompanyRequest extends Request } } - $rules['expense_mailbox'] = new ValidExpenseMailbox($this->company->key, $this->company->account->isPaid() && $this->company->account->plan == 'enterprise'); + $rules['expense_mailbox'] = new ValidExpenseMailbox(); $rules['smtp_host'] = 'sometimes|string|nullable'; $rules['smtp_port'] = 'sometimes|integer|nullable'; diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index e4b24961e85b..06254af3c4eb 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -74,7 +74,7 @@ class UpdateCompanyRequest extends Request $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain()]; } - $rules['expense_mailbox'] = new ValidExpenseMailbox($this->company->key, $this->company->account->isPaid() && $this->company->account->plan == 'enterprise'); // @turbo124 check if this is right + $rules['expense_mailbox'] = new ValidExpenseMailbox(); return $rules; } diff --git a/app/Http/ValidationRules/Company/ValidExpenseMailbox.php b/app/Http/ValidationRules/Company/ValidExpenseMailbox.php index a113c2fc0ea5..d9ab3727cb13 100644 --- a/app/Http/ValidationRules/Company/ValidExpenseMailbox.php +++ b/app/Http/ValidationRules/Company/ValidExpenseMailbox.php @@ -22,15 +22,13 @@ class ValidExpenseMailbox implements Rule { private $validated_schema = false; - private $company_key = false; private $isEnterprise = false; private array $endings; private bool $hasCompanyKey; private array $enterprise_endings; - public function __construct(string $company_key, bool $isEnterprise = false) + public function __construct() { - $this->company_key = $company_key; $this->endings = explode(",", config('ninja.inbound_mailbox.expense_mailbox_endings')); }