From a2eedb3742f655a909a8f90ee9097065518526d6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 4 Oct 2020 09:19:36 +0200 Subject: [PATCH] Fix #3898 --- app/Http/Controllers/RuleGroup/EditController.php | 3 +-- app/Http/Requests/ObjectGroupFormRequest.php | 2 ++ app/Support/Request/ConvertsDataTypes.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index 7ace86699b..09dc3889bd 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -38,8 +38,7 @@ use Illuminate\View\View; */ class EditController extends Controller { - /** @var RuleGroupRepositoryInterface */ - private $repository; + private RuleGroupRepositoryInterface $repository; /** * EditController constructor. diff --git a/app/Http/Requests/ObjectGroupFormRequest.php b/app/Http/Requests/ObjectGroupFormRequest.php index 63d11e1575..14c0e302ec 100644 --- a/app/Http/Requests/ObjectGroupFormRequest.php +++ b/app/Http/Requests/ObjectGroupFormRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Models\ObjectGroup; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -30,6 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class ObjectGroupFormRequest extends FormRequest { + use ConvertsDataTypes; /** * Verify the request. * diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index 4e446f7c28..a4793810d2 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -191,7 +191,7 @@ trait ConvertsDataTypes * * @return string */ - protected function nlString(string $field): string + public function nlString(string $field): string { return app('steam')->nlCleanString((string)($this->get($field) ?? '')); }