diff --git a/app/Api/V1/Requests/AttachmentStoreRequest.php b/app/Api/V1/Requests/AttachmentStoreRequest.php index 07bcc26445..7b0b901daf 100644 --- a/app/Api/V1/Requests/AttachmentStoreRequest.php +++ b/app/Api/V1/Requests/AttachmentStoreRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsValidAttachmentModel; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -33,6 +34,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class AttachmentStoreRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/AttachmentUpdateRequest.php b/app/Api/V1/Requests/AttachmentUpdateRequest.php index abad296b1d..910d07d53d 100644 --- a/app/Api/V1/Requests/AttachmentUpdateRequest.php +++ b/app/Api/V1/Requests/AttachmentUpdateRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -32,6 +33,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class AttachmentUpdateRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/AvailableBudgetRequest.php b/app/Api/V1/Requests/AvailableBudgetRequest.php index 1869c6f411..01b09cd798 100644 --- a/app/Api/V1/Requests/AvailableBudgetRequest.php +++ b/app/Api/V1/Requests/AvailableBudgetRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -32,6 +33,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class AvailableBudgetRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php index 80bada67fd..f9a0118daa 100644 --- a/app/Api/V1/Requests/BillRequest.php +++ b/app/Api/V1/Requests/BillRequest.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; @@ -37,7 +38,7 @@ use Illuminate\Validation\Validator; */ class BillRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/BudgetLimitRequest.php b/app/Api/V1/Requests/BudgetLimitRequest.php index 277538b20b..ef87da2e50 100644 --- a/app/Api/V1/Requests/BudgetLimitRequest.php +++ b/app/Api/V1/Requests/BudgetLimitRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -33,6 +34,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class BudgetLimitRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/BudgetStoreRequest.php b/app/Api/V1/Requests/BudgetStoreRequest.php index 3120eb2894..812d7f4f8e 100644 --- a/app/Api/V1/Requests/BudgetStoreRequest.php +++ b/app/Api/V1/Requests/BudgetStoreRequest.php @@ -24,6 +24,8 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; +use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; @@ -34,6 +36,7 @@ use Illuminate\Validation\Validator; */ class BudgetStoreRequest extends FormRequest { + use ConvertsDataTypes, ValidatesAutoBudgetRequest; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/BudgetUpdateRequest.php b/app/Api/V1/Requests/BudgetUpdateRequest.php index 30a14ee263..e7bf86c17f 100644 --- a/app/Api/V1/Requests/BudgetUpdateRequest.php +++ b/app/Api/V1/Requests/BudgetUpdateRequest.php @@ -24,6 +24,8 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; +use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; @@ -34,6 +36,7 @@ use Illuminate\Validation\Validator; */ class BudgetUpdateRequest extends FormRequest { + use ConvertsDataTypes, ValidatesAutoBudgetRequest; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/CategoryRequest.php b/app/Api/V1/Requests/CategoryRequest.php index cf1f551c78..ebeae6a766 100644 --- a/app/Api/V1/Requests/CategoryRequest.php +++ b/app/Api/V1/Requests/CategoryRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\Category; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -34,6 +35,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class CategoryRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/ConfigurationRequest.php b/app/Api/V1/Requests/ConfigurationRequest.php index 7b31f762e2..7a601ed6a5 100644 --- a/app/Api/V1/Requests/ConfigurationRequest.php +++ b/app/Api/V1/Requests/ConfigurationRequest.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -34,7 +35,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class ConfigurationRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/CurrencyRequest.php b/app/Api/V1/Requests/CurrencyRequest.php index 408adea150..7d50a94ed7 100644 --- a/app/Api/V1/Requests/CurrencyRequest.php +++ b/app/Api/V1/Requests/CurrencyRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; @@ -35,6 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class CurrencyRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/DataDestroyRequest.php b/app/Api/V1/Requests/DataDestroyRequest.php index 16a2f6904f..5d5fe3a31f 100644 --- a/app/Api/V1/Requests/DataDestroyRequest.php +++ b/app/Api/V1/Requests/DataDestroyRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -30,6 +31,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class DataDestroyRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/DateRequest.php b/app/Api/V1/Requests/DateRequest.php index 57ce319f1f..63cd80b69c 100644 --- a/app/Api/V1/Requests/DateRequest.php +++ b/app/Api/V1/Requests/DateRequest.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -34,6 +35,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class DateRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/LinkTypeRequest.php b/app/Api/V1/Requests/LinkTypeRequest.php index bf997be848..2df955d218 100644 --- a/app/Api/V1/Requests/LinkTypeRequest.php +++ b/app/Api/V1/Requests/LinkTypeRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\LinkType; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; @@ -36,6 +37,7 @@ use Illuminate\Validation\Rule; */ class LinkTypeRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/ObjectGroupUpdateRequest.php b/app/Api/V1/Requests/ObjectGroupUpdateRequest.php index 119c0e9765..cc306ed14e 100644 --- a/app/Api/V1/Requests/ObjectGroupUpdateRequest.php +++ b/app/Api/V1/Requests/ObjectGroupUpdateRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -33,7 +34,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class ObjectGroupUpdateRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/PiggyBankRequest.php b/app/Api/V1/Requests/PiggyBankRequest.php index d2a40e1abb..ad4a72c3cc 100644 --- a/app/Api/V1/Requests/PiggyBankRequest.php +++ b/app/Api/V1/Requests/PiggyBankRequest.php @@ -27,6 +27,7 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Rules\IsAssetAccountId; use FireflyIII\Rules\LessThanPiggyTarget; use FireflyIII\Rules\ZeroOrMore; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -38,6 +39,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class PiggyBankRequest extends FormRequest { + use ConvertsDataTypes; + /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/PiggyBankStoreRequest.php b/app/Api/V1/Requests/PiggyBankStoreRequest.php index 327f683edc..872accc702 100644 --- a/app/Api/V1/Requests/PiggyBankStoreRequest.php +++ b/app/Api/V1/Requests/PiggyBankStoreRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\ZeroOrMore; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -34,6 +35,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class PiggyBankStoreRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/PreferenceRequest.php b/app/Api/V1/Requests/PreferenceRequest.php index 5ba0a7fb01..8ebf2d1fe0 100644 --- a/app/Api/V1/Requests/PreferenceRequest.php +++ b/app/Api/V1/Requests/PreferenceRequest.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -33,7 +34,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class PreferenceRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. diff --git a/app/Api/V1/Requests/RecurrenceStoreRequest.php b/app/Api/V1/Requests/RecurrenceStoreRequest.php index 016e95bdc0..40da7f863b 100644 --- a/app/Api/V1/Requests/RecurrenceStoreRequest.php +++ b/app/Api/V1/Requests/RecurrenceStoreRequest.php @@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests; use Carbon\Carbon; use FireflyIII\Rules\BelongsUser; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\GetRecurrenceData; use FireflyIII\Validation\CurrencyValidation; use FireflyIII\Validation\RecurrenceValidation; @@ -38,8 +39,7 @@ use Illuminate\Validation\Validator; */ class RecurrenceStoreRequest extends FormRequest { - use RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData; - + use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RecurrenceUpdateRequest.php b/app/Api/V1/Requests/RecurrenceUpdateRequest.php index ab9469ebb7..44f7571d8d 100644 --- a/app/Api/V1/Requests/RecurrenceUpdateRequest.php +++ b/app/Api/V1/Requests/RecurrenceUpdateRequest.php @@ -26,6 +26,8 @@ namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\Recurrence; use FireflyIII\Rules\BelongsUser; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; +use FireflyIII\Support\Request\GetRecurrenceData; use FireflyIII\Validation\CurrencyValidation; use FireflyIII\Validation\RecurrenceValidation; use FireflyIII\Validation\TransactionValidation; @@ -37,7 +39,7 @@ use Illuminate\Validation\Validator; */ class RecurrenceUpdateRequest extends FormRequest { - use RecurrenceValidation, TransactionValidation, CurrencyValidation; + use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData; /** * Authorize logged in users. diff --git a/app/Api/V1/Requests/RuleGroupRequest.php b/app/Api/V1/Requests/RuleGroupRequest.php index 58d54be023..53374a6a88 100644 --- a/app/Api/V1/Requests/RuleGroupRequest.php +++ b/app/Api/V1/Requests/RuleGroupRequest.php @@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\RuleGroup; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; @@ -35,6 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class RuleGroupRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleGroupTestRequest.php b/app/Api/V1/Requests/RuleGroupTestRequest.php index 8c12b8ee2e..86d922a139 100644 --- a/app/Api/V1/Requests/RuleGroupTestRequest.php +++ b/app/Api/V1/Requests/RuleGroupTestRequest.php @@ -30,6 +30,7 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Collection; use Log; @@ -39,6 +40,7 @@ use Log; */ class RuleGroupTestRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleGroupTriggerRequest.php b/app/Api/V1/Requests/RuleGroupTriggerRequest.php index d01a45d99b..fdcc59fb55 100644 --- a/app/Api/V1/Requests/RuleGroupTriggerRequest.php +++ b/app/Api/V1/Requests/RuleGroupTriggerRequest.php @@ -30,6 +30,7 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Collection; use Log; @@ -39,6 +40,7 @@ use Log; */ class RuleGroupTriggerRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleStoreRequest.php b/app/Api/V1/Requests/RuleStoreRequest.php index febed3ac51..8e40460236 100644 --- a/app/Api/V1/Requests/RuleStoreRequest.php +++ b/app/Api/V1/Requests/RuleStoreRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; use function is_array; @@ -35,6 +36,7 @@ use function is_array; */ class RuleStoreRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleTestRequest.php b/app/Api/V1/Requests/RuleTestRequest.php index d145987e21..12797cb11f 100644 --- a/app/Api/V1/Requests/RuleTestRequest.php +++ b/app/Api/V1/Requests/RuleTestRequest.php @@ -30,6 +30,7 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Collection; use Log; @@ -39,6 +40,7 @@ use Log; */ class RuleTestRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleTriggerRequest.php b/app/Api/V1/Requests/RuleTriggerRequest.php index 426a1bb23a..e2954dadaf 100644 --- a/app/Api/V1/Requests/RuleTriggerRequest.php +++ b/app/Api/V1/Requests/RuleTriggerRequest.php @@ -29,6 +29,7 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Collection; use Log; @@ -38,6 +39,7 @@ use Log; */ class RuleTriggerRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/RuleUpdateRequest.php b/app/Api/V1/Requests/RuleUpdateRequest.php index ab7f3be55b..658902f55d 100644 --- a/app/Api/V1/Requests/RuleUpdateRequest.php +++ b/app/Api/V1/Requests/RuleUpdateRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; use function is_array; @@ -35,6 +36,7 @@ use function is_array; */ class RuleUpdateRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/TagStoreRequest.php b/app/Api/V1/Requests/TagStoreRequest.php index 5748233c9e..d0b487c1fc 100644 --- a/app/Api/V1/Requests/TagStoreRequest.php +++ b/app/Api/V1/Requests/TagStoreRequest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\Location; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -34,7 +35,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class TagStoreRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/TagUpdateRequest.php b/app/Api/V1/Requests/TagUpdateRequest.php index a65c7f2c8d..5cd7fbf925 100644 --- a/app/Api/V1/Requests/TagUpdateRequest.php +++ b/app/Api/V1/Requests/TagUpdateRequest.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; use FireflyIII\Models\Location; +use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Foundation\Http\FormRequest; /** @@ -35,7 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class TagUpdateRequest extends FormRequest { - + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/TransactionLinkRequest.php b/app/Api/V1/Requests/TransactionLinkRequest.php index 230c9a9b0b..e5f0eb1743 100644 --- a/app/Api/V1/Requests/TransactionLinkRequest.php +++ b/app/Api/V1/Requests/TransactionLinkRequest.php @@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\User; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; @@ -35,6 +36,7 @@ use Illuminate\Validation\Validator; */ class TransactionLinkRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/TransactionStoreRequest.php b/app/Api/V1/Requests/TransactionStoreRequest.php index 90b3749514..6160397114 100644 --- a/app/Api/V1/Requests/TransactionStoreRequest.php +++ b/app/Api/V1/Requests/TransactionStoreRequest.php @@ -28,6 +28,7 @@ use FireflyIII\Rules\BelongsUser; use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\IsDateOrTime; use FireflyIII\Support\NullArrayObject; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\CurrencyValidation; use FireflyIII\Validation\GroupValidation; use FireflyIII\Validation\TransactionValidation; @@ -40,7 +41,7 @@ use Log; */ class TransactionStoreRequest extends FormRequest { - use TransactionValidation, GroupValidation, CurrencyValidation; + use TransactionValidation, GroupValidation, CurrencyValidation, ConvertsDataTypes; /** * Authorize logged in users. diff --git a/app/Api/V1/Requests/TransactionUpdateRequest.php b/app/Api/V1/Requests/TransactionUpdateRequest.php index 824e652426..fbcc68e43e 100644 --- a/app/Api/V1/Requests/TransactionUpdateRequest.php +++ b/app/Api/V1/Requests/TransactionUpdateRequest.php @@ -28,6 +28,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Rules\BelongsUser; use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\IsDateOrTime; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\GroupValidation; use FireflyIII\Validation\TransactionValidation; use Illuminate\Foundation\Http\FormRequest; @@ -39,7 +40,7 @@ use Log; */ class TransactionUpdateRequest extends FormRequest { - use TransactionValidation, GroupValidation; + use TransactionValidation, GroupValidation, ConvertsDataTypes; /** @var array Array values. */ private $arrayFields; diff --git a/app/Api/V1/Requests/UserStoreRequest.php b/app/Api/V1/Requests/UserStoreRequest.php index b9d6d4c2fe..16901df1e8 100644 --- a/app/Api/V1/Requests/UserStoreRequest.php +++ b/app/Api/V1/Requests/UserStoreRequest.php @@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\User; use Illuminate\Foundation\Http\FormRequest; @@ -35,6 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class UserStoreRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Api/V1/Requests/UserUpdateRequest.php b/app/Api/V1/Requests/UserUpdateRequest.php index 6b3b915f29..f4f4524bd5 100644 --- a/app/Api/V1/Requests/UserUpdateRequest.php +++ b/app/Api/V1/Requests/UserUpdateRequest.php @@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Rules\IsBoolean; +use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\User; use Illuminate\Foundation\Http\FormRequest; @@ -35,6 +36,7 @@ use Illuminate\Foundation\Http\FormRequest; */ class UserUpdateRequest extends FormRequest { + use ConvertsDataTypes; /** * Authorize logged in users. * diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 33a62089cb..3602945c41 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -39,78 +39,7 @@ use Log; class Request extends FormRequest { use ConvertsDataTypes; - /** - * @param $array - * - * @return array|null - */ - public function arrayFromValue($array): ?array - { - if (is_array($array)) { - return $array; - } - if (null === $array) { - return null; - } - if (is_string($array)) { - return explode(',', $array); - } - return null; - } - - /** - * @param string $value - * - * @return bool - */ - public function convertBoolean(?string $value): bool - { - if (null === $value) { - return false; - } - if ('true' === $value) { - return true; - } - if ('yes' === $value) { - return true; - } - if (1 === $value) { - return true; - } - if ('1' === $value) { - return true; - } - if (true === $value) { - return true; - } - - return false; - } - - /** - * @param string|null $string - * - * @return Carbon|null - */ - public function dateFromValue(?string $string): ?Carbon - { - if (null === $string) { - return null; - } - if ('' === $string) { - return null; - } - try { - $carbon = new Carbon($string); - } catch (Exception $e) { - Log::debug(sprintf('Invalid date: %s: %s', $string, $e->getMessage())); - - return null; - } - - return $carbon; - } /** * Return floating value. @@ -131,67 +60,14 @@ class Request extends FormRequest - /** - * Parse to integer - * - * @param string|null $string - * - * @return int|null - */ - public function integerFromValue(?string $string): ?int - { - if (null === $string) { - return null; - } - if ('' === $string) { - return null; - } - - return (int) $string; - } - - - - /** - * Parse and clean a string, but keep the newlines. - * - * @param string|null $string - * - * @return string|null - */ - public function nlStringFromValue(?string $string): ?string - { - if (null === $string) { - return null; - } - $result = app('steam')->nlCleanString($string); - - return '' === $result ? null : $result; - - } - /** - * Parse and clean a string. - * - * @param string|null $string - * - * @return string|null - */ - public function stringFromValue(?string $string): ?string - { - if (null === $string) { - return null; - } - $result = app('steam')->cleanString($string); - return '' === $result ? null : $result; - } /** * Return date time or NULL. @@ -229,40 +105,4 @@ class Request extends FormRequest return $result; } - - /** - * @param Validator $validator - */ - protected function validateAutoBudgetAmount(Validator $validator): void - { - $data = $validator->getData(); - $type = $data['auto_budget_type'] ?? ''; - $amount = $data['auto_budget_amount'] ?? ''; - $period = (string) ($data['auto_budget_period'] ?? ''); - $currencyId = $data['auto_budget_currency_id'] ?? ''; - $currencyCode = $data['auto_budget_currency_code'] ?? ''; - if (is_numeric($type)) { - $type = (int) $type; - } - if (0 === $type || 'none' === $type || '' === $type) { - return; - } - // basic float check: - if ('' === $amount) { - $validator->errors()->add('auto_budget_amount', (string) trans('validation.amount_required_for_auto_budget')); - } - if (1 !== bccomp((string) $amount, '0')) { - $validator->errors()->add('auto_budget_amount', (string) trans('validation.auto_budget_amount_positive')); - } - if ('' === $period) { - $validator->errors()->add('auto_budget_period', (string) trans('validation.auto_budget_period_mandatory')); - } - if ('' === $currencyCode && '' === $currencyId) { - $validator->errors()->add('auto_budget_amount', (string) trans('validation.require_currency_info')); - } - } - - - - } diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index 4e8ab9ec92..d8e4a23683 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -64,6 +64,107 @@ trait ConvertsDataTypes return (int) $this->get($field); } + /** + * Parse and clean a string, but keep the newlines. + * + * @param string|null $string + * + * @return string|null + */ + protected function nlStringFromValue(?string $string): ?string + { + if (null === $string) { + return null; + } + $result = app('steam')->nlCleanString($string); + + return '' === $result ? null : $result; + + } + + /** + * @param $array + * + * @return array|null + */ + protected function arrayFromValue($array): ?array + { + if (is_array($array)) { + return $array; + } + if (null === $array) { + return null; + } + if (is_string($array)) { + return explode(',', $array); + } + + return null; + } + + + + /** + * @param string|null $string + * + * @return Carbon|null + */ + protected function dateFromValue(?string $string): ?Carbon + { + if (null === $string) { + return null; + } + if ('' === $string) { + return null; + } + try { + $carbon = new Carbon($string); + } catch (Exception $e) { + Log::debug(sprintf('Invalid date: %s: %s', $string, $e->getMessage())); + + return null; + } + + return $carbon; + } + + /** + * Parse and clean a string. + * + * @param string|null $string + * + * @return string|null + */ + protected function stringFromValue(?string $string): ?string + { + if (null === $string) { + return null; + } + $result = app('steam')->cleanString($string); + + return '' === $result ? null : $result; + } + + + /** + * Parse to integer + * + * @param string|null $string + * + * @return int|null + */ + protected function integerFromValue(?string $string): ?int + { + if (null === $string) { + return null; + } + if ('' === $string) { + return null; + } + + return (int) $string; + } + /** * Return string value, but keep newlines. * @@ -113,6 +214,36 @@ trait ConvertsDataTypes return app('steam')->nlCleanString((string) ($this->get($field) ?? '')); } + + /** + * @param string $value + * + * @return bool + */ + protected function convertBoolean(?string $value): bool + { + if (null === $value) { + return false; + } + if ('true' === $value) { + return true; + } + if ('yes' === $value) { + return true; + } + if (1 === $value) { + return true; + } + if ('1' === $value) { + return true; + } + if (true === $value) { + return true; + } + + return false; + } + /** * Return string value, or NULL if empty. * diff --git a/app/Support/Steam.php b/app/Support/Steam.php index d8d088ee5e..4b3a319346 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -362,8 +362,10 @@ class Steam * Remove weird chars from strings. * * @param string $string + * TODO migrate to trait. * * @return string + * @deprecated */ public function cleanString(string $string): string { @@ -425,8 +427,10 @@ class Steam * Remove weird chars from strings, but keep newlines and tabs. * * @param string $string + * TODO migrate to trait. * * @return string + * @deprecated */ public function nlCleanString(string $string): string { diff --git a/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php new file mode 100644 index 0000000000..13ce60046c --- /dev/null +++ b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php @@ -0,0 +1,65 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Validation\AutoBudget; + + +use Illuminate\Validation\Validator; + +/** + * Trait ValidatesAutoBudgetRequest + */ +trait ValidatesAutoBudgetRequest +{ + /** + * @param Validator $validator + */ + protected function validateAutoBudgetAmount(Validator $validator): void + { + $data = $validator->getData(); + $type = $data['auto_budget_type'] ?? ''; + $amount = $data['auto_budget_amount'] ?? ''; + $period = (string) ($data['auto_budget_period'] ?? ''); + $currencyId = $data['auto_budget_currency_id'] ?? ''; + $currencyCode = $data['auto_budget_currency_code'] ?? ''; + if (is_numeric($type)) { + $type = (int) $type; + } + if (0 === $type || 'none' === $type || '' === $type) { + return; + } + // basic float check: + if ('' === $amount) { + $validator->errors()->add('auto_budget_amount', (string) trans('validation.amount_required_for_auto_budget')); + } + if (1 !== bccomp((string) $amount, '0')) { + $validator->errors()->add('auto_budget_amount', (string) trans('validation.auto_budget_amount_positive')); + } + if ('' === $period) { + $validator->errors()->add('auto_budget_period', (string) trans('validation.auto_budget_period_mandatory')); + } + if ('' === $currencyCode && '' === $currencyId) { + $validator->errors()->add('auto_budget_amount', (string) trans('validation.require_currency_info')); + } + } +}