Skip to content

Firefly III: a personal finances manager

Fix #11050

James Coled47e4c4f24fc
diff --git a/app/Api/V1/Requests/DateRangeRequest.php b/app/Api/V1/Requests/DateRangeRequest.php
index 831e7b625c..2ed73be358 100644
--- a/app/Api/V1/Requests/DateRangeRequest.php
+++ b/app/Api/V1/Requests/DateRangeRequest.php
@@ -40,6 +40,9 @@ class DateRangeRequest extends ApiRequest
$validator->after(
function (Validator $validator): void {
if (!$validator->valid()) {
+ // set null values
+ $this->attributes->set('start', null);
+ $this->attributes->set('end', null);
return;
}
$start = $this->getCarbonDate('start')?->startOfDay();
diff --git a/app/Api/V1/Requests/DateRequest.php b/app/Api/V1/Requests/DateRequest.php
index c894cfa2b5..9b8e8221d7 100644
--- a/app/Api/V1/Requests/DateRequest.php
+++ b/app/Api/V1/Requests/DateRequest.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
+use Carbon\Carbon;
use Illuminate\Validation\Validator;
class DateRequest extends ApiRequest
@@ -47,7 +48,7 @@ class DateRequest extends ApiRequest
// if we also have a range, date must be in that range
$start = $this->attributes->get('start');
$end = $this->attributes->get('end');
- if ($date && $start && $end && !$date->between($start, $end)) {
+ if ($date instanceOf Carbon && $start instanceOf Carbon && $end instanceOf Carbon && !$date->between($start, $end)) {
$validator->errors()->add('date', (string)trans('validation.between_date'));
}