kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Refactor phpstan errors.

Browse Source
This commit is contained in:
James Cole
2023-10-29 17:41:14 +01:00
parent 5e32878d01
commit 12675dd950
60 changed files with 297 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Rules/IsValidAttachmentModel.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Rules;
use Closure;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
@@ -39,15 +40,15 @@ use FireflyIII\Repositories\Journal\JournalAPIRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Contracts\Validation\ValidationRule;
/**
* Class IsValidAttachmentModel
*/
class IsValidAttachmentModel implements Rule
class IsValidAttachmentModel implements ValidationRule
{
/** @var string */
private $model;
private string $model;
/**
* IsValidAttachmentModel constructor.
@@ -76,27 +77,17 @@ class IsValidAttachmentModel implements Rule
}
/**
* Get the validation error message.
* @param string $attribute
* @param mixed $value
* @param Closure $fail
*
* @return string
* @return void
*/
public function message(): string
{
return (string)trans('validation.model_id_invalid');
}
/**
* Determine if the validation rule passes.
*
* @param string $attribute
* @param mixed $value
*
* @return bool
*/
public function passes($attribute, $value): bool
public function validate(string $attribute, mixed $value, Closure $fail): void
{
if (!auth()->check()) {
return false;
$fail('validation.model_id_invalid')->translate();
return;
}
$methods = [
Account::class => 'validateAccount',
@@ -111,11 +102,15 @@ class IsValidAttachmentModel implements Rule
if (!array_key_exists($this->model, $methods)) {
app('log')->error(sprintf('Cannot validate model "%s" in %s.', substr($this->model, 0, 20), __METHOD__));
return false;
$fail('validation.model_id_invalid')->translate();
return;
}
$method = $methods[$this->model];
return $this->$method((int)$value);
$result = $this->$method((int)$value);
if(false === $result) {
$fail('validation.model_id_invalid')->translate();
}
}
/**