mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-29 18:20:01 +00:00
Import statements and update configuration.
This commit is contained in:
@@ -26,13 +26,15 @@ namespace FireflyIII\Rules\Account;
|
||||
|
||||
use FireflyIII\Support\Http\Api\AccountFilter;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
use Override;
|
||||
|
||||
class IsValidAccountType implements ValidationRule
|
||||
{
|
||||
use AccountFilter;
|
||||
|
||||
#[\Override]
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
#[Override]
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
// only check the type.
|
||||
if (array_key_exists('type', $value)) {
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules\Admin;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidDiscordUrl implements ValidationRule
|
||||
{
|
||||
@@ -36,7 +37,7 @@ class IsValidDiscordUrl implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('' === $value) {
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules\Admin;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidSlackOrDiscordUrl implements ValidationRule
|
||||
{
|
||||
@@ -36,7 +37,7 @@ class IsValidSlackOrDiscordUrl implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('' === $value) {
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules\Admin;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidSlackUrl implements ValidationRule
|
||||
{
|
||||
@@ -36,7 +37,7 @@ class IsValidSlackUrl implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('' === $value) {
|
||||
|
@@ -32,13 +32,14 @@ use FireflyIII\Models\Category;
|
||||
use FireflyIII\Models\PiggyBank;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class BelongsUser
|
||||
*/
|
||||
class BelongsUser implements ValidationRule
|
||||
{
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$attribute = $this->parseAttribute($attribute);
|
||||
if (!auth()->check()) {
|
||||
|
@@ -33,6 +33,7 @@ use FireflyIII\Models\PiggyBank;
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use FireflyIII\Models\UserGroup;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class BelongsUserGroup
|
||||
@@ -47,7 +48,7 @@ class BelongsUserGroup implements ValidationRule
|
||||
*/
|
||||
public function __construct(private readonly UserGroup $userGroup) {}
|
||||
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$attribute = $this->parseAttribute($attribute);
|
||||
if (!auth()->check()) {
|
||||
|
@@ -31,6 +31,8 @@ use FireflyIII\User;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
use Override;
|
||||
|
||||
class IsAllowedGroupAction implements ValidationRule
|
||||
{
|
||||
@@ -47,8 +49,8 @@ class IsAllowedGroupAction implements ValidationRule
|
||||
/**
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
#[\Override]
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
#[Override]
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if ('GET' === $this->methodName) {
|
||||
// need at least "read only rights".
|
||||
@@ -69,7 +71,7 @@ class IsAllowedGroupAction implements ValidationRule
|
||||
$this->validateUserGroup((int) $value, $fail);
|
||||
}
|
||||
|
||||
private function validateUserGroup(int $userGroupId, \Closure $fail): void
|
||||
private function validateUserGroup(int $userGroupId, Closure $fail): void
|
||||
{
|
||||
Log::debug(sprintf('validateUserGroup: %s', static::class));
|
||||
if (!auth()->check()) {
|
||||
|
@@ -26,6 +26,7 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\Enums\AccountTypeEnum;
|
||||
use FireflyIII\Models\Account;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsAssetAccountId
|
||||
@@ -35,7 +36,7 @@ class IsAssetAccountId implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$accountId = (int) $value;
|
||||
|
||||
|
@@ -25,6 +25,7 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsBoolean
|
||||
@@ -34,7 +35,7 @@ class IsBoolean implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (is_bool($value)) {
|
||||
return;
|
||||
|
@@ -28,6 +28,7 @@ use Carbon\Carbon;
|
||||
use Carbon\Exceptions\InvalidDateException;
|
||||
use Carbon\Exceptions\InvalidFormatException;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsDateOrTime
|
||||
@@ -37,7 +38,7 @@ class IsDateOrTime implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('' === $value) {
|
||||
|
@@ -28,6 +28,7 @@ use FireflyIII\Models\UserGroup;
|
||||
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsDefaultUserGroupName
|
||||
@@ -39,7 +40,7 @@ class IsDefaultUserGroupName implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
app('log')->debug(sprintf('Now in %s(%s)', __METHOD__, $value));
|
||||
|
||||
|
@@ -25,6 +25,7 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* TODO not sure where this is used.
|
||||
@@ -38,7 +39,7 @@ class IsDuplicateTransaction implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$this->value = $value;
|
||||
|
||||
|
@@ -25,6 +25,7 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
class IsFilterValueIn implements ValidationRule
|
||||
{
|
||||
@@ -33,7 +34,7 @@ class IsFilterValueIn implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!is_array($value)) {
|
||||
return;
|
||||
|
@@ -27,6 +27,7 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\Enums\TransactionTypeEnum;
|
||||
use FireflyIII\Validation\AccountValidator;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsTransferAccount
|
||||
@@ -36,7 +37,7 @@ class IsTransferAccount implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
app('log')->debug(sprintf('Now in %s(%s)', __METHOD__, $value));
|
||||
|
||||
|
@@ -28,17 +28,18 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\TransactionRules\Expressions\ActionExpression;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Translation\PotentiallyTranslatedString;
|
||||
use Closure;
|
||||
|
||||
class IsValidActionExpression implements ValidationRule
|
||||
{
|
||||
/**
|
||||
* Check that the given action expression is syntactically valid.
|
||||
*
|
||||
* @param \Closure(string): PotentiallyTranslatedString $fail
|
||||
* @param Closure(string): PotentiallyTranslatedString $fail
|
||||
*
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (false === config('firefly.feature_flags.expression_engine')) {
|
||||
return;
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidAmount implements ValidationRule
|
||||
{
|
||||
@@ -36,7 +37,7 @@ class IsValidAmount implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
|
||||
|
@@ -41,6 +41,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
|
||||
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
|
||||
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class IsValidAttachmentModel
|
||||
@@ -70,7 +71,7 @@ class IsValidAttachmentModel implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!auth()->check()) {
|
||||
$fail('validation.model_id_invalid')->translate();
|
||||
|
@@ -26,6 +26,8 @@ namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Closure;
|
||||
use JsonException;
|
||||
|
||||
/**
|
||||
* Class IsValidBulkClause
|
||||
@@ -49,7 +51,7 @@ class IsValidBulkClause implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$result = $this->basicValidation((string) $value);
|
||||
if (false === $result) {
|
||||
@@ -64,7 +66,7 @@ class IsValidBulkClause implements ValidationRule
|
||||
{
|
||||
try {
|
||||
$array = \Safe\json_decode($value, true, 8, JSON_THROW_ON_ERROR);
|
||||
} catch (\JsonException) {
|
||||
} catch (JsonException) {
|
||||
$this->error = (string) trans('validation.json');
|
||||
|
||||
return false;
|
||||
|
@@ -28,13 +28,14 @@ use Carbon\Carbon;
|
||||
use Carbon\Exceptions\InvalidDateException;
|
||||
use Carbon\Exceptions\InvalidFormatException;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
class IsValidDateRange implements ValidationRule
|
||||
{
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('' === $value) {
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidPositiveAmount implements ValidationRule
|
||||
{
|
||||
@@ -36,7 +37,7 @@ class IsValidPositiveAmount implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$fail('validation.numeric')->translate();
|
||||
|
@@ -28,6 +28,7 @@ namespace FireflyIII\Rules;
|
||||
use FireflyIII\Support\Validation\ValidatesAmountsTrait;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Closure;
|
||||
|
||||
class IsValidZeroOrMoreAmount implements ValidationRule
|
||||
{
|
||||
@@ -38,7 +39,7 @@ class IsValidZeroOrMoreAmount implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (true === $this->nullable && null === $value) {
|
||||
return;
|
||||
|
@@ -25,6 +25,7 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class LessThanPiggyTarget
|
||||
@@ -42,7 +43,7 @@ class LessThanPiggyTarget implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
// TODO not sure if this is still used.
|
||||
}
|
||||
|
@@ -28,6 +28,7 @@ use FireflyIII\Enums\AccountTypeEnum;
|
||||
use FireflyIII\Models\Account;
|
||||
use FireflyIII\Models\AccountMeta;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class UniqueAccountNumber
|
||||
@@ -66,7 +67,7 @@ class UniqueAccountNumber implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!auth()->check()) {
|
||||
return;
|
||||
|
@@ -28,6 +28,7 @@ use FireflyIII\Enums\AccountTypeEnum;
|
||||
use FireflyIII\Models\Account;
|
||||
use FireflyIII\Support\Facades\Steam;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class UniqueIban
|
||||
@@ -69,7 +70,7 @@ class UniqueIban implements ValidationRule
|
||||
return (string) trans('validation.unique_iban_for_user');
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!$this->passes($attribute, $value)) {
|
||||
$fail((string) trans('validation.unique_iban_for_user'));
|
||||
|
@@ -26,6 +26,7 @@ namespace FireflyIII\Rules;
|
||||
|
||||
use FireflyIII\Models\TransactionJournal;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class ValidJournals
|
||||
@@ -35,7 +36,7 @@ class ValidJournals implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
app('log')->debug('In ValidJournals::passes');
|
||||
if (!is_array($value)) {
|
||||
|
@@ -25,6 +25,7 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Class ValidRecurrenceRepetitionType
|
||||
@@ -36,7 +37,7 @@ class ValidRecurrenceRepetitionType implements ValidationRule
|
||||
*
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
if ('daily' === $value) {
|
||||
|
@@ -26,6 +26,8 @@ namespace FireflyIII\Rules;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Closure;
|
||||
use InvalidArgumentException;
|
||||
|
||||
/**
|
||||
* Class ValidRecurrenceRepetitionValue
|
||||
@@ -35,7 +37,7 @@ class ValidRecurrenceRepetitionValue implements ValidationRule
|
||||
/**
|
||||
* @SuppressWarnings("PHPMD.UnusedFormalParameter")
|
||||
*/
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
$value = (string) $value;
|
||||
|
||||
@@ -102,7 +104,7 @@ class ValidRecurrenceRepetitionValue implements ValidationRule
|
||||
|
||||
try {
|
||||
Carbon::createFromFormat('Y-m-d', $dateString);
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
} catch (InvalidArgumentException $e) {
|
||||
app('log')->debug(sprintf('Could not parse date %s: %s', $dateString, $e->getMessage()));
|
||||
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user