IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update various things. I know, great description.

Browse Source
This commit is contained in:
James Cole
2023-11-30 17:28:44 +01:00
parent 627db2c2df
commit 271e4271eb
100 changed files with 488 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Rules/IsAssetAccountId.php
View File

@@ -40,6 +40,8 @@ class IsAssetAccountId implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/IsBoolean.php
View File

@@ -38,6 +38,8 @@ class IsBoolean implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/IsDateOrTime.php
View File

@@ -41,6 +41,8 @@ class IsDateOrTime implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

4
app/Rules/IsTransferAccount.php
View File

@@ -40,6 +40,8 @@ class IsTransferAccount implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{
@@ -59,7 +61,7 @@ class IsTransferAccount implements ValidationRule
$validAccount = $validator->validateSource(['id' => (int)$value,]);
app('log')->debug(sprintf('Search by id (%d), result is %s.', (int)$value, var_export($validAccount, true)));
if(false === $validAccount) {
if (false === $validAccount) {
$fail('validation.not_transfer_account')->translate();
}
}

33
app/Rules/IsValidAttachmentModel.php
View File

@@ -82,6 +82,8 @@ class IsValidAttachmentModel implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{
@@ -89,26 +91,19 @@ class IsValidAttachmentModel implements ValidationRule
$fail('validation.model_id_invalid')->translate();
return;
}
$methods = [
Account::class => 'validateAccount',
Bill::class => 'validateBill',
Budget::class => 'validateBudget',
Category::class => 'validateCategory',
PiggyBank::class => 'validatePiggyBank',
Tag::class => 'validateTag',
Transaction::class => 'validateTransaction',
TransactionJournal::class => 'validateJournal',
];
if (!array_key_exists($this->model, $methods)) {
app('log')->error(sprintf('Cannot validate model "%s" in %s.', substr($this->model, 0, 20), __METHOD__));
$result = match ($this->model) {
Account::class => $this->validateAccount((int)$value),
Bill::class => $this->validateBill((int)$value),
Budget::class => $this->validateBudget((int)$value),
Category::class => $this->validateCategory((int)$value),
PiggyBank::class => $this->validatePiggyBank((int)$value),
Tag::class => $this->validateTag((int)$value),
Transaction::class => $this->validateTransaction((int)$value),
TransactionJournal::class => $this->validateJournal((int)$value),
default => false,
};
$fail('validation.model_id_invalid')->translate();
return;
}
$method = $methods[$this->model];
$result = $this->$method((int)$value); // @phpstan-ignore-line
if(false === $result) {
if (false === $result) {
$fail('validation.model_id_invalid')->translate();
}
}

2
app/Rules/IsValidBulkClause.php
View File

@@ -60,6 +60,8 @@ class IsValidBulkClause implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/LessThanPiggyTarget.php
View File

@@ -48,6 +48,8 @@ class LessThanPiggyTarget implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/UniqueAccountNumber.php
View File

@@ -79,6 +79,8 @@ class UniqueAccountNumber implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/UniqueIban.php
View File

@@ -95,6 +95,8 @@ class UniqueIban implements ValidationRule
*
* @return bool
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
*/
public function passes($attribute, $value): bool
{

2
app/Rules/ValidJournals.php
View File

@@ -41,6 +41,8 @@ class ValidJournals implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

2
app/Rules/ValidRecurrenceRepetitionType.php
View File

@@ -39,6 +39,8 @@ class ValidRecurrenceRepetitionType implements ValidationRule
* @param string $attribute
* @param mixed $value
* @param Closure $fail
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{

6
app/Rules/ValidRecurrenceRepetitionValue.php
View File

@@ -41,6 +41,8 @@ class ValidRecurrenceRepetitionValue implements ValidationRule
* @param Closure $fail
*
* @return void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{
@@ -62,12 +64,12 @@ class ValidRecurrenceRepetitionValue implements ValidationRule
// Value is like: weekly,7
if (str_starts_with($value, 'weekly') && $this->validateWeekly($value)) {
return ;
return;
}
// Value is like: yearly,2018-01-01
if (str_starts_with($value, 'yearly') && $this->validateYearly($value)) {
return ;
return;
}
$fail('validation.valid_recurrence_rep_type')->translate();