kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

fix: migrate action expression validation to separate rule class

Browse Source
This commit is contained in:
Michael Thomas
2024-03-09 12:57:34 -05:00
parent 69ca88d9f8
commit c4bf2aae7d
7 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Validation/FireflyValidator.php
View File

@@ -254,27 +254,6 @@ class FireflyValidator extends Validator
return 1 === $count;
}
public function validateRuleActionExpression(string $attribute, string $value = null): bool
{
$value ??= '';
$expr = new ActionExpression($value);
return $expr->isValid();
}
public function replaceRuleActionExpression(string $message, string $attribute): string
{
$value = $this->getValue($attribute);
$expr = new ActionExpression($value);
$err = $expr->getValidationError();
if ($err == null) {
return $message;
}
return str_replace(":error", $err->getMessage(), $message);
}
public function validateRuleActionValue(string $attribute, string $value = null): bool
{
// first, get the index from this string: