kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-23 12:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Expand action and clean up code.

Browse Source
This commit is contained in:
James Cole
2023-11-04 14:09:51 +01:00
parent 6eabe5fa8c
commit 5a35960434
23 changed files with 119 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Rules/IsDateOrTime.php
View File

@@ -35,7 +35,6 @@ use Illuminate\Contracts\Validation\ValidationRule;
*/
class IsDateOrTime implements ValidationRule
{
/**
* @param string $attribute
* @param mixed $value
@@ -47,7 +46,8 @@ class IsDateOrTime implements ValidationRule
{
$value = (string)$value;
if ('' === $value) {
$fail('validation.date_or_time')->translate();;
$fail('validation.date_or_time')->translate();
;
return;
}
if (10 === strlen($value)) {
@@ -57,12 +57,14 @@ class IsDateOrTime implements ValidationRule
} catch (InvalidDateException $e) { // @phpstan-ignore-line
app('log')->error(sprintf('"%s" is not a valid date: %s', $value, $e->getMessage()));
$fail('validation.date_or_time')->translate();;
$fail('validation.date_or_time')->translate();
;
return;
} catch (InvalidFormatException $e) { // @phpstan-ignore-line
app('log')->error(sprintf('"%s" is of an invalid format: %s', $value, $e->getMessage()));
$fail('validation.date_or_time')->translate();;
$fail('validation.date_or_time')->translate();
;
return;
}
@@ -74,12 +76,14 @@ class IsDateOrTime implements ValidationRule
} catch (InvalidDateException $e) { // @phpstan-ignore-line
app('log')->error(sprintf('"%s" is not a valid date or time: %s', $value, $e->getMessage()));
$fail('validation.date_or_time')->translate();;
$fail('validation.date_or_time')->translate();
;
return;
} catch (InvalidFormatException $e) {
app('log')->error(sprintf('"%s" is of an invalid format: %s', $value, $e->getMessage()));
$fail('validation.date_or_time')->translate();;
$fail('validation.date_or_time')->translate();
;
return;
}
}