Merge pull request #11044 from firefly-iii/release-1760115302

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Controller.php

@@ -67,6 +67,7 @@ abstract class Controller extends BaseController
 
     protected bool                $convertToPrimary = false;
     protected TransactionCurrency $primaryCurrency;
+
     /** @deprecated use Request classes */
     protected ParameterBag        $parameters;
 
@@ -100,7 +101,7 @@ abstract class Controller extends BaseController
 
     /**
      * @deprecated use Request classes
-     * Method to grab all parameters from the URL.
+     * Method to grab all parameters from the URL
      */
     private function getParameters(): ParameterBag
     {

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

@@ -129,7 +129,7 @@ class ShowController extends Controller
         $this->repository->resetAccountOrder();
         $account->refresh();
         $manager              = $this->getManager();
-        [$start, $end, $date,] = $request->attributes->all();
+        [$start, $end, $date] = $request->attributes->all();
 
         // enrich
         /** @var User $admin */

app/Api/V1/Requests/AggregateFormRequest.php

@@ -25,8 +25,8 @@ namespace FireflyIII\Api\V1\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
+use RuntimeException;
 
 abstract class AggregateFormRequest extends ApiRequest
 {
@@ -47,7 +47,7 @@ abstract class AggregateFormRequest extends ApiRequest
             $requestClass         = is_array($config) ? array_shift($config) : $config;
 
             if (!is_a($requestClass, Request::class, true)) {
-                throw new \RuntimeException('getRequests() must return class-strings of subclasses of Request');
+                throw new RuntimeException('getRequests() must return class-strings of subclasses of Request');
             }
 
             $instance             = $this->requests[] = new $requestClass();
@@ -70,9 +70,9 @@ abstract class AggregateFormRequest extends ApiRequest
         // check all subrequests for rules and combine them
         return array_reduce(
             $this->requests,
-            static fn (array $rules, FormRequest $request) =>
+            static fn (array $rules, FormRequest $request) => $rules
-                $rules +
+                + (
-                (method_exists($request, 'rules')
+                    method_exists($request, 'rules')
                     ? $request->rules()
                     : []
                 ),

app/Api/V1/Requests/ApiRequest.php

@@ -23,11 +23,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Validator;
 
 class ApiRequest extends FormRequest
 {
@@ -38,7 +36,7 @@ class ApiRequest extends FormRequest
 
     public function handleConfig(array $config): void
     {
-        if (in_array('required', $config)) {
+        if (in_array('required', $config, true)) {
             $this->required = 'required';
         }
     }

app/Api/V1/Requests/DateRangeRequest.php

@@ -23,10 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Exceptions\ValidationException;
-use FireflyIII\Support\Request\ChecksLogin;
-use FireflyIII\Support\Request\ConvertsDataTypes;
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 
 class DateRangeRequest extends ApiRequest

app/Api/V1/Requests/PaginationRequest.php

@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
-use FireflyIII\Models\Account;
 use FireflyIII\Rules\IsValidSortInstruction;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Validation\Validator;
+use RuntimeException;
 
 class PaginationRequest extends ApiRequest
 {
@@ -40,11 +40,10 @@ class PaginationRequest extends ApiRequest
         $this->sortClass = $config['sort_class'] ?? null;
 
         if (!$this->sortClass) {
-            throw new \RuntimeException('PaginationRequest requires a sort_class config');
+            throw new RuntimeException('PaginationRequest requires a sort_class config');
         }
     }
 
-
     public function rules(): array
     {
         return [

composer.lock

@@ -11333,11 +11333,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.30",
+            "version": "2.1.31",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
-                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
                 "shasum": ""
             },
             "require": {
@@ -11382,7 +11382,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-10-02T16:07:52+00:00"
+            "time": "2025-10-10T14:14:11+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",

config/firefly.php

@@ -79,7 +79,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2025-10-10',
-    'build_time'                   => 1760095871,
+    'build_time'                   => 1760115185,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.
 

package-lock.json

@@ -4075,9 +4075,9 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.8.15",
+            "version": "2.8.16",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.15.tgz",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.16.tgz",
-            "integrity": "sha512-qsJ8/X+UypqxHXN75M7dF88jNK37dLBRW7LeUzCPz+TNs37G8cfWy9nWzS+LS//g600zrt2le9KuXt0rWfDz5Q==",
+            "integrity": "sha512-OMu3BGQ4E7P1ErFsIPpbJh0qvDudM/UuJeHgkAvfWe+0HFJCXh+t/l8L6fVLR55RI/UbKrVLnAXZSVwd9ysWYw==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -7088,9 +7088,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.5.3",
+            "version": "25.6.0",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.5.3.tgz",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.6.0.tgz",
-            "integrity": "sha512-joFqorDeQ6YpIXni944upwnuHBf5IoPMuqAchGVeQLdWC2JOjxgM9V8UGLhNIIH/Q8QleRxIi0BSRQehSrDLcg==",
+            "integrity": "sha512-tTn8fLrwBYtnclpL5aPXK/tAYBLWVvoHM1zdfXoRNLcI+RvtMsoZRV98ePlaW3khHYKuNh/Q65W/+NVFUeIwVw==",
             "funding": [
                 {
                     "type": "individual",