Merge pull request #11048 from firefly-iii/release-1760157167

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -128,23 +128,25 @@ class ShowController extends Controller
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();
         $account->refresh();
-        $manager              = $this->getManager();
-        [$start, $end, $date] = $request->attributes->all();
+        $manager                = $this->getManager();
+        ['start'     => $start,
+            'end'    => $end,
+            'date'   => $date,] = $request->attributes->all();
 
         // enrich
         /** @var User $admin */
-        $admin                = auth()->user();
-        $enrichment           = new AccountEnrichment();
+        $admin                  = auth()->user();
+        $enrichment             = new AccountEnrichment();
         $enrichment->setDate($date);
         $enrichment->setStart($start);
         $enrichment->setEnd($end);
         $enrichment->setUser($admin);
-        $account              = $enrichment->enrichSingle($account);
+        $account                = $enrichment->enrichSingle($account);
 
 
         /** @var AccountTransformer $transformer */
-        $transformer          = app(AccountTransformer::class);
-        $resource             = new Item($account, $transformer, self::RESOURCE_KEY);
+        $transformer            = app(AccountTransformer::class);
+        $resource               = new Item($account, $transformer, self::RESOURCE_KEY);
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

app/Api/V1/Requests/DateRangeRequest.php

@@ -30,8 +30,8 @@ class DateRangeRequest extends ApiRequest
     public function rules(): array
     {
         return [
-            'start' => sprintf('date|after:1970-01-02|before:2038-01-17|before:end|required_with:end|', $this->required),
-            'end'   => sprintf('date|after:1970-01-02|before:2038-01-17|after:start|required_with:start|', $this->required),
+            'start' => sprintf('date|after:1970-01-02|before:2038-01-17|before:end|required_with:end|%s', $this->required),
+            'end'   => sprintf('date|after:1970-01-02|before:2038-01-17|after:start|required_with:start|%s', $this->required),
         ];
     }
 
@@ -39,6 +39,8 @@ class DateRangeRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
+                $this->attributes->set('start', null);
+                $this->attributes->set('end', null);
                 if (!$validator->valid()) {
                     return;
                 }

app/Api/V1/Requests/DateRequest.php

@@ -38,6 +38,7 @@ class DateRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
+                $this->attributes->set('date', null);
                 if (!$validator->valid()) {
                     return;
                 }

app/Api/V1/Requests/PaginationRequest.php

@@ -47,7 +47,7 @@ class PaginationRequest extends ApiRequest
     public function rules(): array
     {
         return [
-            'sort'  => ['nullable', new IsValidSortInstruction($this->sortClass)],
+            'sort'  => ['nullable', new IsValidSortInstruction((string)$this->sortClass)],
             'limit' => 'numeric|min:1|max:131337',
             'page'  => 'numeric|min:1|max:131337',
         ];

app/Rules/IsValidSortInstruction.php

@@ -38,6 +38,11 @@ class IsValidSortInstruction implements ValidationRule
 
             return;
         }
+        if ('' === $value) {
+            // don't validate.
+
+            return;
+        }
         $validParameters = config(sprintf('firefly.allowed_sort_parameters.%s', $shortClass));
         if (!is_array($validParameters)) {
             $fail('validation.no_sort_instructions')->translate(['object' => $shortClass]);

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-10-10',
-    'build_time'                   => 1760115185,
+    'version'                      => 'develop/2025-10-11',
+    'build_time'                   => 1760157052,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.