From 294fafe3dca93ddcd090188711b0782cdd3a4c2d Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:49:46 +0200 Subject: [PATCH 01/14] Move validation for store provider configuration to Form request & custom rule instead of the service, separating concerns --- .../Requests/StoreProviderConfiguration.php | 15 ++++- app/Rules/ProviderConfigurationRule.php | 64 +++++++++++++++++++ app/Services/ProviderConfigurationService.php | 2 - 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 app/Rules/ProviderConfigurationRule.php diff --git a/app/Http/Requests/StoreProviderConfiguration.php b/app/Http/Requests/StoreProviderConfiguration.php index e7ac3ea..c4aa3a8 100644 --- a/app/Http/Requests/StoreProviderConfiguration.php +++ b/app/Http/Requests/StoreProviderConfiguration.php @@ -4,7 +4,9 @@ namespace App\Http\Requests; +use App\Rules\ProviderConfigurationRule; use Illuminate\Foundation\Http\FormRequest; +use Upmind\ProvisionBase\Registry\Registry; class StoreProviderConfiguration extends FormRequest { @@ -21,14 +23,23 @@ public function authorize(): bool * * @return array|string> */ - public function rules(): array + public function rules(Registry $registry): array { return [ 'name' => [ 'required', 'string', 'max:255' - ] + ], + 'field_values' => [ + 'array', + 'nullable', + new ProviderConfigurationRule( + $registry, + $this->route('category_code'), + $this->route('provider_code') + ) + ], ]; } } diff --git a/app/Rules/ProviderConfigurationRule.php b/app/Rules/ProviderConfigurationRule.php new file mode 100644 index 0000000..51f3600 --- /dev/null +++ b/app/Rules/ProviderConfigurationRule.php @@ -0,0 +1,64 @@ +registry = $registry; + $this->categoryCode = $categoryCode; + $this->providerCode = $providerCode; + } + + /** + * Run the validation rule. + * + * @param \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString $fail + * @throws \Illuminate\Validation\ValidationException + */ + public function validate(string $attribute, mixed $value, Closure $fail): void + { + $provider = $this->registry->getProvider($this->categoryCode, $this->providerCode); + + if ($provider === null) { + $fail(sprintf( + 'The provision %s provider %s is not installed.', + $this->categoryCode, + $this->providerCode + )); + } + + $rules = $provider->getConstructor()->getParameter()->getRules()->expand(); + + $this->validator->setRules($rules); + $this->validator->setData($value); + + $this->validator->validate(); + } + + public function setValidator(Validator $validator) + { + $this->validator = $validator; + + return $this; + } +} diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index 692110b..c12af4b 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -20,8 +20,6 @@ public function create( string $name, array $data ): ProviderConfiguration { - $this->validateData($provider, $data); - $configuration = new ProviderConfiguration(); $configuration->name = $name; $configuration->category_code = $provider->getCategory()->getIdentifier(); From ef43495b6bda9137e251bc962666cd1199a74ce3 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:58:36 +0200 Subject: [PATCH 02/14] cast to string --- app/Http/Requests/StoreProviderConfiguration.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/StoreProviderConfiguration.php b/app/Http/Requests/StoreProviderConfiguration.php index c4aa3a8..551a254 100644 --- a/app/Http/Requests/StoreProviderConfiguration.php +++ b/app/Http/Requests/StoreProviderConfiguration.php @@ -36,8 +36,9 @@ public function rules(Registry $registry): array 'nullable', new ProviderConfigurationRule( $registry, - $this->route('category_code'), - $this->route('provider_code') + // We don't really expect these to be any other than strings. + (string) $this->route('category_code'), + (string) $this->route('provider_code') ) ], ]; From 804b6f87cee8325752f5d7507f6174f4bcff3081 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:36:26 +0200 Subject: [PATCH 03/14] removed docblock and set return type on validation rule --- app/Rules/ProviderConfigurationRule.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Rules/ProviderConfigurationRule.php b/app/Rules/ProviderConfigurationRule.php index 51f3600..d48d2f2 100644 --- a/app/Rules/ProviderConfigurationRule.php +++ b/app/Rules/ProviderConfigurationRule.php @@ -12,11 +12,6 @@ class ProviderConfigurationRule implements ValidationRule, ValidatorAwareRule { - /** - * The validator instance. - * - * @var \Illuminate\Validation\Validator - */ protected Validator $validator; private Registry $registry; private string $categoryCode; @@ -55,7 +50,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void $this->validator->validate(); } - public function setValidator(Validator $validator) + public function setValidator(Validator $validator): ProviderConfigurationRule|static { $this->validator = $validator; From 6f12c90a5e288dd92acf81a898264e6c3646d0c2 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:00:00 +0200 Subject: [PATCH 04/14] Add custom rule factory and use it on store provision request --- app/Exceptions/Handler.php | 29 ----------- .../ProviderConfigurationRuleFactory.php | 48 +++++++++++++++++++ .../Requests/StoreProviderConfiguration.php | 16 ++++--- 3 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 app/Factories/Rules/ProviderConfigurationRuleFactory.php diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index b264951..06424a6 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,9 +2,7 @@ namespace App\Exceptions; -use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Throwable; class Handler extends ExceptionHandler { @@ -26,31 +24,4 @@ class Handler extends ExceptionHandler 'password', 'password_confirmation', ]; - - /** - * Report or log an exception. - * - * @param \Throwable $exception - * @return void - * - * @throws \Throwable - */ - public function report(Throwable $exception) - { - parent::report($exception); - } - - /** - * Render an exception into an HTTP response. - * - * @param \Illuminate\Http\Request $request - * @param \Throwable $exception - * @return \Symfony\Component\HttpFoundation\Response - * - * @throws \Throwable - */ - public function render($request, Throwable $exception) - { - return parent::render($request, $exception); - } } diff --git a/app/Factories/Rules/ProviderConfigurationRuleFactory.php b/app/Factories/Rules/ProviderConfigurationRuleFactory.php new file mode 100644 index 0000000..c54e1c8 --- /dev/null +++ b/app/Factories/Rules/ProviderConfigurationRuleFactory.php @@ -0,0 +1,48 @@ +|string> + * @return array> + * + * @throws \InvalidArgumentException */ public function rules(Registry $registry): array { @@ -34,12 +36,12 @@ public function rules(Registry $registry): array 'field_values' => [ 'array', 'nullable', - new ProviderConfigurationRule( - $registry, + ProviderConfigurationRuleFactory::create([ + 'registry' => $registry, // We don't really expect these to be any other than strings. - (string) $this->route('category_code'), - (string) $this->route('provider_code') - ) + 'category_code' => (string) $this->route('category_code'), + 'provider_code' => (string) $this->route('provider_code'), + ]), ], ]; } From d0f04b3c3b0ab5f6a30812123e2013afc5051f2b Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:27:15 +0200 Subject: [PATCH 05/14] rename request validation name for consistency and minor update on controller/service for storing config --- .../ProviderConfigurationStoreController.php | 36 ++++++++++--------- ... => ProviderConfigurationStoreRequest.php} | 2 +- app/Services/ProviderConfigurationService.php | 10 ++---- 3 files changed, 22 insertions(+), 26 deletions(-) rename app/Http/Requests/{StoreProviderConfiguration.php => ProviderConfigurationStoreRequest.php} (95%) diff --git a/app/Http/Controllers/Web/ProviderConfigurationStoreController.php b/app/Http/Controllers/Web/ProviderConfigurationStoreController.php index 251707a..8b58921 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationStoreController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationStoreController.php @@ -7,10 +7,10 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Http\Controllers\Traits\TransformsArrayDot; -use App\Http\Requests\StoreProviderConfiguration; +use App\Http\Requests\ProviderConfigurationStoreRequest; use App\Services\ProviderConfigurationService; -use Illuminate\Http\Request; -use Illuminate\Validation\ValidationException; +use Illuminate\Http\RedirectResponse; +use Illuminate\Routing\Redirector; use Upmind\ProvisionBase\Registry\Registry; class ProviderConfigurationStoreController extends Controller @@ -18,24 +18,26 @@ class ProviderConfigurationStoreController extends Controller use InteractsWithRegistry; use TransformsArrayDot; - public function __invoke(StoreProviderConfiguration $request, Registry $registry) + public function __construct( + private readonly ProviderConfigurationService $service, + private readonly Redirector $redirector + ) { + } + + public function __invoke(ProviderConfigurationStoreRequest $request, Registry $registry): RedirectResponse { + /** @var \Upmind\ProvisionBase\Registry\Data\ProviderRegister $provider */ $provider = $this->getProvider($registry, $request); - try { - $service = new ProviderConfigurationService(); - $configuration = $service->create( - $provider, - $request->get('name'), - $this->undot($request->get('field_values', [])) - ); - } catch (ValidationException $e) { - return redirect()->back()->withErrors($e->errors()); - } - - return redirect(route('provider-configuration-show', [ + $configuration = $this->service->create( + $provider, + $request->get('name'), + $this->undot($request->get('field_values', [])) + ); + + return $this->redirector->route('provider-configuration-show', [ 'configuration' => $configuration, 'created' => 1, - ])); + ]); } } diff --git a/app/Http/Requests/StoreProviderConfiguration.php b/app/Http/Requests/ProviderConfigurationStoreRequest.php similarity index 95% rename from app/Http/Requests/StoreProviderConfiguration.php rename to app/Http/Requests/ProviderConfigurationStoreRequest.php index 65949e9..0ecf99a 100644 --- a/app/Http/Requests/StoreProviderConfiguration.php +++ b/app/Http/Requests/ProviderConfigurationStoreRequest.php @@ -8,7 +8,7 @@ use Illuminate\Foundation\Http\FormRequest; use Upmind\ProvisionBase\Registry\Registry; -class StoreProviderConfiguration extends FormRequest +class ProviderConfigurationStoreRequest extends FormRequest { /** * Determine if the user is authorized to make this request. diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index c12af4b..edcf32d 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -12,14 +12,8 @@ class ProviderConfigurationService { - /** - * @throws ValidationException If the given configuration data is invalid - */ - public function create( - ProviderRegister $provider, - string $name, - array $data - ): ProviderConfiguration { + public function create(ProviderRegister $provider, string $name, array $data): ProviderConfiguration + { $configuration = new ProviderConfiguration(); $configuration->name = $name; $configuration->category_code = $provider->getCategory()->getIdentifier(); From eebfe760e5b8ac1321b1ff3412057e51b11e3ccf Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:43:11 +0200 Subject: [PATCH 06/14] change docblocks --- app/Http/Requests/ProviderConfigurationStoreRequest.php | 2 +- app/Services/ProviderConfigurationService.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/ProviderConfigurationStoreRequest.php b/app/Http/Requests/ProviderConfigurationStoreRequest.php index 0ecf99a..bf86734 100644 --- a/app/Http/Requests/ProviderConfigurationStoreRequest.php +++ b/app/Http/Requests/ProviderConfigurationStoreRequest.php @@ -21,7 +21,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array> + * @return array> * * @throws \InvalidArgumentException */ diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index edcf32d..31bd3ea 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -12,8 +12,11 @@ class ProviderConfigurationService { - public function create(ProviderRegister $provider, string $name, array $data): ProviderConfiguration - { + public function create( + ProviderRegister $provider, + string $name, + array $data + ): ProviderConfiguration { $configuration = new ProviderConfiguration(); $configuration->name = $name; $configuration->category_code = $provider->getCategory()->getIdentifier(); From bc18a51345f2f588908202e8260d0c7056cfbab5 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:43:32 +0200 Subject: [PATCH 07/14] Refactor Update provision configuration update method to use new request validation methodology --- .../ProviderConfigurationUpdateController.php | 38 +++++++------- .../ProviderConfigurationUpdateRequest.php | 51 +++++++++++++++++++ app/Services/ProviderConfigurationService.php | 5 -- 3 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 app/Http/Requests/ProviderConfigurationUpdateRequest.php diff --git a/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php b/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php index dd17cff..b9d2719 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php @@ -7,32 +7,36 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Http\Controllers\Traits\TransformsArrayDot; +use App\Http\Requests\ProviderConfigurationUpdateRequest; use App\Models\ProviderConfiguration; use App\Services\ProviderConfigurationService; -use Illuminate\Http\Request; -use Illuminate\Validation\ValidationException; +use Illuminate\Http\RedirectResponse; +use Illuminate\Routing\Redirector; class ProviderConfigurationUpdateController extends Controller { use InteractsWithRegistry; use TransformsArrayDot; - public function __invoke(Request $request, ProviderConfiguration $configuration) - { - try { - $service = new ProviderConfigurationService(); - $service->update( - $configuration, - $request->get('name'), - $this->undot($request->get('field_values', [])) - ); - } catch (ValidationException $e) { - return redirect()->back()->withErrors($e->errors(), 'field_values'); - } + public function __construct( + private readonly ProviderConfigurationService $service, + private readonly Redirector $redirector + ) { + } + + public function __invoke( + ProviderConfigurationUpdateRequest $request, + ProviderConfiguration $configuration + ): RedirectResponse { + $configuration = $this->service->update( + $configuration, + $request->get('name'), + $this->undot($request->get('field_values', [])) + ); - return redirect(route('provider-configuration-show', [ + return $this->redirector->route('provider-configuration-show', [ 'configuration' => $configuration, - 'updated' => 1 - ])); + 'updated' => 1, + ]); } } diff --git a/app/Http/Requests/ProviderConfigurationUpdateRequest.php b/app/Http/Requests/ProviderConfigurationUpdateRequest.php new file mode 100644 index 0000000..a83b656 --- /dev/null +++ b/app/Http/Requests/ProviderConfigurationUpdateRequest.php @@ -0,0 +1,51 @@ +> + * + * @throws \InvalidArgumentException + */ + public function rules(Registry $registry): array + { + /** @var \App\Models\ProviderConfiguration $configuration */ + $configuration = $this->route('configuration'); + + return [ + 'name' => [ + 'required', + 'string', + 'max:255' + ], + 'field_values' => [ + 'array', + 'nullable', + ProviderConfigurationRuleFactory::create([ + 'registry' => $registry, + // Pass category_code and provider_code from the configuration model + 'category_code' => $configuration->category_code, + 'provider_code' => $configuration->provider_code, + ]), + ], + ]; + } +} diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index 31bd3ea..5ef61a3 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -27,16 +27,11 @@ public function create( return $configuration; } - /** - * @throws ValidationException If the given configuration data is invalid - */ public function update( ProviderConfiguration $configuration, string $name, array $data ): ProviderConfiguration { - $this->validateData($configuration->getProvider(), $data); - $configuration->name = $name; $configuration->data = $data; $configuration->save(); From 0c920e4625ea6ea264350bee3353693455e848af Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:46:10 +0200 Subject: [PATCH 08/14] refactor destroy controller using constructor to load redirector --- .../Web/ProviderConfigurationDestroyController.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php index 07335c5..acb9338 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php @@ -7,20 +7,27 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Models\ProviderConfiguration; +use App\Services\ProviderConfigurationService; use Illuminate\Http\Request; +use Illuminate\Routing\Redirector; class ProviderConfigurationDestroyController extends Controller { use InteractsWithRegistry; + public function __construct( + private readonly Redirector $redirector + ) { + } + public function __invoke(Request $request, ProviderConfiguration $configuration) { $configuration->delete(); - return redirect(route('provider-show', [ + return $this->redirector->route('provider-show', [ 'category_code' => $configuration->category_code, 'provider_code' => $configuration->provider_code, 'configuration_deleted' => 1 - ])); + ]); } } From 2618c0810b4da9ebcc4f0ef438287cbac6fd2c2f Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:46:35 +0200 Subject: [PATCH 09/14] remove not used import --- .../Controllers/Web/ProviderConfigurationDestroyController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php index acb9338..0ad3885 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php @@ -7,7 +7,6 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Models\ProviderConfiguration; -use App\Services\ProviderConfigurationService; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; From 7dcd7d99d367252c7f1d1e570eff79c62ca7c80f Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:47:10 +0200 Subject: [PATCH 10/14] add return type to controller --- .../Controllers/Web/ProviderConfigurationDestroyController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php index 0ad3885..d024c4b 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationDestroyController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Controller; use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Models\ProviderConfiguration; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; @@ -19,7 +20,7 @@ public function __construct( ) { } - public function __invoke(Request $request, ProviderConfiguration $configuration) + public function __invoke(Request $request, ProviderConfiguration $configuration): RedirectResponse { $configuration->delete(); From fea4f75bb186bbd140a1cdf22cbf5d5ca2427c08 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:48:01 +0200 Subject: [PATCH 11/14] remove not used method for validation (now in request) from provider configuration service --- app/Services/ProviderConfigurationService.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index 5ef61a3..c5ebcba 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -6,8 +6,6 @@ use App\Models\ProviderConfiguration; use App\Models\ProvisionRequest; -use Illuminate\Support\Facades\Validator; -use Illuminate\Validation\ValidationException; use Upmind\ProvisionBase\Registry\Data\ProviderRegister; class ProviderConfigurationService @@ -51,14 +49,4 @@ public function delete(ProviderConfiguration $configuration) $configuration->delete(); } - - /** - * @throws ValidationException If the given configuration data is invalid - */ - protected function validateData(ProviderRegister $provider, array $data): void - { - $rules = $provider->getConstructor()->getParameter()->getRules()->expand(); - - Validator::make($data, $rules)->validate(); - } } From c5e15d84251bf81031f7197c1ffbf3255f294e38 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:49:13 +0200 Subject: [PATCH 12/14] removed not used method from provision config service --- app/Services/ProviderConfigurationService.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/Services/ProviderConfigurationService.php b/app/Services/ProviderConfigurationService.php index c5ebcba..d3dc22a 100644 --- a/app/Services/ProviderConfigurationService.php +++ b/app/Services/ProviderConfigurationService.php @@ -5,7 +5,6 @@ namespace App\Services; use App\Models\ProviderConfiguration; -use App\Models\ProvisionRequest; use Upmind\ProvisionBase\Registry\Data\ProviderRegister; class ProviderConfigurationService @@ -36,17 +35,4 @@ public function update( return $configuration; } - - public function delete(ProviderConfiguration $configuration) - { - $requestService = new ProvisionRequestService(); - ProvisionRequest::where('configuration_id', $configuration->id) - ->chunk(20, function ($requests) use ($requestService) { - foreach ($requests as $request) { - $requestService->delete($request); - } - }); - - $configuration->delete(); - } } From a628a324c4c8e869465e847c7fa8a69c2afcd4a8 Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:54:49 +0200 Subject: [PATCH 13/14] use post from request --- .../Controllers/Web/ProviderConfigurationStoreController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Web/ProviderConfigurationStoreController.php b/app/Http/Controllers/Web/ProviderConfigurationStoreController.php index 8b58921..c16380f 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationStoreController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationStoreController.php @@ -31,8 +31,8 @@ public function __invoke(ProviderConfigurationStoreRequest $request, Registry $r $configuration = $this->service->create( $provider, - $request->get('name'), - $this->undot($request->get('field_values', [])) + $request->post('name'), + $this->undot($request->post('field_values', [])) ); return $this->redirector->route('provider-configuration-show', [ From 6b324ac2870e489d4056e3fdde90077c3a807bbc Mon Sep 17 00:00:00 2001 From: RoussKS <7203382+RoussKS@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:55:04 +0200 Subject: [PATCH 14/14] remove not used trait and use post in update request --- .../Web/ProviderConfigurationUpdateController.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php b/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php index b9d2719..86db43c 100644 --- a/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php +++ b/app/Http/Controllers/Web/ProviderConfigurationUpdateController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Web; use App\Http\Controllers\Controller; -use App\Http\Controllers\Traits\InteractsWithRegistry; use App\Http\Controllers\Traits\TransformsArrayDot; use App\Http\Requests\ProviderConfigurationUpdateRequest; use App\Models\ProviderConfiguration; @@ -15,7 +14,6 @@ class ProviderConfigurationUpdateController extends Controller { - use InteractsWithRegistry; use TransformsArrayDot; public function __construct( @@ -30,8 +28,8 @@ public function __invoke( ): RedirectResponse { $configuration = $this->service->update( $configuration, - $request->get('name'), - $this->undot($request->get('field_values', [])) + $request->post('name'), + $this->undot($request->post('field_values', [])) ); return $this->redirector->route('provider-configuration-show', [