Merge pull request #10591 from firefly-iii/release-1752464168

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -19,26 +19,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
-
 $current = __DIR__;
 
 $paths = [
     $current . '/../../app',
     $current . '/../../config',
-    $current . '/../../database',
     $current . '/../../routes',
     $current . '/../../tests',
-    $current . '/../../resources/lang/en_US',
 ];
 
 $finder = PhpCsFixer\Finder::create()
                            ->in($paths);
 
 
-$config = new PhpCsFixer\Config();
-$config->setParallelConfig(ParallelConfigFactory::detect());
+$config = (new PhpCsFixer\Config())
+        ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
+        ;
 return $config->setRules(
+
     [
         // rule sets
         '@PHP83Migration'               => true,
@@ -53,9 +51,6 @@ return $config->setRules(
         'statement_indentation'         => true,
         'void_return'                   => true,
 
-        // about importing statements
-        'global_namespace_import' => ['import_classes' => true, 'import_constants' => true, 'import_functions' => true],
-
         // disabled rules
         'native_function_invocation'    => false, // annoying
         'php_unit_data_provider_name'   => false, // bloody annoying long test names
@@ -64,9 +59,15 @@ return $config->setRules(
         'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
         'type_declaration_spaces'       => false,
         'cast_spaces'                   => false,
-        'phpdoc_to_comment'             => false, // do not overrule single line comment style, breaks phpstan.
+
+        // enabled rules
+        'global_namespace_import' => true, // matches with rector.
 
         // complex rules
+        'phpdoc_to_comment' => ['ignored_tags' => ['var']],
+        'php_unit_test_case_static_method_calls' => [
+            'call_type' => 'this',
+        ],
         'array_syntax'                  => ['syntax' => 'short'],
         'binary_operator_spaces'        => [
             'default'   => 'at_least_single_space',
@@ -76,5 +77,7 @@ return $config->setRules(
                 '??=' => 'align_single_space_minimal_by_scope',
             ],
         ],
-    ])
+    ]
+
+)
               ->setFinder($finder);

.ci/php-cs-fixer/composer.lock

@@ -406,58 +406,59 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.75.0",
+            "version": "v3.82.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c"
+                "reference": "684ed3ab41008a2a4848de8bde17eb168c596247"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c",
-                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/684ed3ab41008a2a4848de8bde17eb168c596247",
+                "reference": "684ed3ab41008a2a4848de8bde17eb168c596247",
                 "shasum": ""
             },
             "require": {
                 "clue/ndjson-react": "^1.0",
                 "composer/semver": "^3.4",
-                "composer/xdebug-handler": "^3.0.3",
+                "composer/xdebug-handler": "^3.0.5",
                 "ext-filter": "*",
                 "ext-hash": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "fidry/cpu-core-counter": "^1.2",
                 "php": "^7.4 || ^8.0",
-                "react/child-process": "^0.6.5",
+                "react/child-process": "^0.6.6",
                 "react/event-loop": "^1.0",
-                "react/promise": "^2.0 || ^3.0",
+                "react/promise": "^2.11 || ^3.0",
                 "react/socket": "^1.0",
                 "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.1 || ^6.0 || ^7.0",
-                "symfony/console": "^5.4 || ^6.4 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.31",
-                "symfony/polyfill-php80": "^1.31",
-                "symfony/polyfill-php81": "^1.31",
-                "symfony/process": "^5.4 || ^6.4 || ^7.2",
-                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "symfony/console": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/finder": "^5.4.45 || ^6.4.17 || ^7.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.16 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.32",
+                "symfony/polyfill-php80": "^1.32",
+                "symfony/polyfill-php81": "^1.32",
+                "symfony/process": "^5.4.47 || ^6.4.20 || ^7.2",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.19 || ^7.0"
             },
             "require-dev": {
                 "facile-it/paraunit": "^1.3.1 || ^2.6",
                 "infection/infection": "^0.29.14",
-                "justinrainbow/json-schema": "^5.3 || ^6.2",
-                "keradus/cli-executor": "^2.1",
+                "justinrainbow/json-schema": "^5.3 || ^6.4",
+                "keradus/cli-executor": "^2.2",
                 "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.7",
+                "php-coveralls/php-coveralls": "^2.8",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3",
-                "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3"
+                "phpunit/phpunit": "^9.6.23 || ^10.5.47 || ^11.5.25",
+                "symfony/polyfill-php84": "^1.32",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.23 || ^7.3.1",
+                "symfony/yaml": "^5.4.45 || ^6.4.23 || ^7.3.1"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -498,7 +499,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.82.2"
             },
             "funding": [
                 {
@@ -506,7 +507,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-31T18:40:42+00:00"
+            "time": "2025-07-08T21:13:15+00:00"
         },
         {
             "name": "psr/container",
@@ -1256,16 +1257,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
                 "shasum": ""
             },
             "require": {
@@ -1330,7 +1331,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -1346,7 +1347,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",

.ci/phpcs.sh

@@ -28,7 +28,8 @@ composer update --quiet
 rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=txt -v \
+    --format=txt \
+    -v \
     --allow-risky=yes
 
 EXIT_CODE=$?

.ci/rector.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
 use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
+use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector;
 use Rector\Transform\Rector\String_\StringToClassConstantRector;
 use RectorLaravel\Set\LaravelLevelSetList;
 
@@ -32,6 +33,7 @@ use RectorLaravel\Set\LaravelLevelSetList;
 return RectorConfig::configure()
     ->withSkip([
         ChangeOrIfContinueToMultiContinueRector::class,
+        AddParamBasedOnParentClassMethodRector::class,
         StringToClassConstantRector::class => [
             __DIR__ . '/../app/Http/Controllers/Auth/LoginController.php',
         ],

.env.example

@@ -329,7 +329,7 @@ FIREFLY_III_LAYOUT=v1
 # Which Query Parser implementation to use for the search engine and rules
 # 'new' is experimental, 'legacy' is the classic one
 #
-QUERY_PARSER_IMPLEMENTATION=legacy
+QUERY_PARSER_IMPLEMENTATION=new
 
 #
 # Please make sure this URL matches the external URL of your Firefly III installation.

.github/workflows/release.yml

@@ -259,6 +259,12 @@ jobs:
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
             echo "" >> output.txt
             echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+
+            # donations!
+            echo '' >> output.txt
+            echo '### Support Firefly III' >> output.txt
+            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
+            echo '' >> output.txt
           fi
           # describe a branch release
           if [[ "$version" == branch* ]]; then
@@ -299,6 +305,11 @@ jobs:
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
             echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
 
+            # donations!
+            echo '' >> output.txt
+            echo '### Support Firefly III' >> output.txt
+            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
+            echo '' >> output.txt
           fi
 
           # describe alpha release

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -58,7 +58,7 @@ class AutocompleteRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'date|after:1900-01-01|before:2099-12-31',
+            'date' => 'date|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V1/Requests/Chart/ChartRequest.php

@@ -60,8 +60,8 @@ class ChartRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'       => 'required|date|after:1900-01-01|before:2099-12-31|before_or_equal:end',
-            'end'         => 'required|date|after:1900-01-01|before:2099-12-31|after_or_equal:start',
+            'start'       => 'required|date|after:1970-01-02|before:2038-01-17|before_or_equal:end',
+            'end'         => 'required|date|after:1970-01-02|before:2038-01-17|after_or_equal:start',
             'preselected' => sprintf('nullable|in:%s', implode(',', config('firefly.preselected_accounts'))),
             'period'      => sprintf('nullable|in:%s', implode(',', config('firefly.valid_view_ranges'))),
             'accounts.*'  => 'exists:accounts,id',

app/Api/V1/Requests/Data/DateRequest.php

@@ -65,9 +65,9 @@ class DateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'date|after:1900-01-01|before:2099-12-31',
-            'start' => 'date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
-            'end'   => 'date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
+            'date'  => 'date|after:1970-01-02|before:2038-01-17',
+            'start' => 'date|after:1970-01-02|before:2038-01-17|before:end|required_with:end',
+            'end'   => 'date|after:1970-01-02|before:2038-01-17|after:start|required_with:start',
         ];
     }
 }

app/Api/V1/Requests/Generic/DateRequest.php

@@ -55,8 +55,8 @@ class DateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'required|date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'start' => 'required|date|after:1970-01-02|before:2038-01-17',
+            'end'   => 'required|date|after_or_equal:start|before:2038-01-17|after:1970-01-02',
         ];
     }
 }

app/Api/V1/Requests/Generic/SingleDateRequest.php

@@ -53,7 +53,7 @@ class SingleDateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -66,8 +66,8 @@ class Request extends FormRequest
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
             'amount'        => ['nullable', new IsValidPositiveAmount()],
-            'start'         => 'date|after:1900-01-01|before:2099-12-31',
-            'end'           => 'date|after:1900-01-01|before:2099-12-31',
+            'start'         => 'date|after:1970-01-02|before:2038-01-17',
+            'end'           => 'date|after:1970-01-02|before:2038-01-17',
         ];
     }
 

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -80,9 +80,9 @@ class StoreRequest extends FormRequest
             'amount_max'     => ['required', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
-            'date'           => 'date|required|after:1900-01-01|before:2099-12-31',
-            'end_date'       => 'nullable|date|after:date|after:1900-01-01|before:2099-12-31',
-            'extension_date' => 'nullable|date|after:date|after:1900-01-01|before:2099-12-31',
+            'date'           => 'date|required|after:1970-01-02|before:2038-01-17',
+            'end_date'       => 'nullable|date|after:date|after:1970-01-02|before:2038-01-17',
+            'extension_date' => 'nullable|date|after:date|after:1970-01-02|before:2038-01-17',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly|required',
             'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -81,9 +81,9 @@ class UpdateRequest extends FormRequest
             'amount_max'     => ['nullable', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
-            'date'           => 'date|after:1900-01-01|before:2099-12-31',
-            'end_date'       => 'date|after:date|after:1900-01-01|before:2099-12-31',
-            'extension_date' => 'date|after:date|after:1900-01-01|before:2099-12-31',
+            'date'           => 'date|after:1970-01-02|before:2038-01-17',
+            'end_date'       => 'date|after:date|after:1970-01-02|before:2038-01-17',
+            'extension_date' => 'date|after:date|after:1970-01-02|before:2038-01-17',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly',
             'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -67,8 +67,8 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'         => 'date|after:1900-01-01|before:2099-12-31',
-            'end'           => 'date|after:1900-01-01|before:2099-12-31',
+            'start'         => 'date|after:1970-01-02|before:2038-01-17',
+            'end'           => 'date|after:1970-01-02|before:2038-01-17',
             'amount'        => ['nullable', new IsValidPositiveAmount()],
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',

app/Api/V1/Requests/Models/CurrencyExchangeRate/DestroyRequest.php

@@ -45,7 +45,7 @@ class DestroyRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreRequest.php

@@ -61,7 +61,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1970-01-02|before:2038-01-17',
             'rate' => 'required|numeric|gt:0',
             'from' => 'required|exists:transaction_currencies,code',
             'to'   => 'required|exists:transaction_currencies,code',

app/Api/V1/Requests/Models/CurrencyExchangeRate/UpdateRequest.php

@@ -50,7 +50,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'date|after:1900-01-01|before:2099-12-31',
+            'date' => 'date|after:1970-01-02|before:2038-01-17',
             'rate' => 'required|numeric|gt:0',
         ];
     }

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -154,7 +154,7 @@ class UpdateRequest extends FormRequest
         return [
             'title'                                => sprintf('min:1|max:255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
             'description'                          => 'min:1|max:32768',
-            'first_date'                           => 'date|after:1900-01-01|before:2099-12-31',
+            'first_date'                           => 'date|after:1970-01-02|before:2038-01-17',
             'apply_rules'                          => [new IsBoolean()],
             'active'                               => [new IsBoolean()],
             'repeat_until'                         => 'nullable|date',

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -71,8 +71,8 @@ class TestRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
+            'start'      => 'date|after:1970-01-02|before:2038-01-17',
+            'end'        => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17',
             'accounts'   => '',
             'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -65,8 +65,8 @@ class TriggerRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
+            'start'      => 'date|after:1970-01-02|before:2038-01-17',
+            'end'        => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17',
             'accounts'   => '',
             'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -65,8 +65,8 @@ class TestRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
+            'start'      => 'date|after:1970-01-02|before:2038-01-17',
+            'end'        => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17',
             'accounts'   => '',
             'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -69,8 +69,8 @@ class TriggerRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
+            'start' => 'date|after:1970-01-02|before:2038-01-17',
+            'end'   => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -62,7 +62,7 @@ class StoreRequest extends FormRequest
         $rules = [
             'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag|max:1024',
             'description' => 'min:1|nullable|max:32768',
-            'date'        => 'date|nullable|after:1900-01-01|before:2099-12-31',
+            'date'        => 'date|nullable|after:1970-01-02|before:2038-01-17',
         ];
 
         return Location::requestRules($rules);

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -66,7 +66,7 @@ class UpdateRequest extends FormRequest
         $rules = [
             'tag'         => 'min:1|max:1024|uniqueObjectForUser:tags,tag,'.$tag->id,
             'description' => 'min:1|nullable|max:32768',
-            'date'        => 'date|nullable|after:1900-01-01|before:2099-12-31',
+            'date'        => 'date|nullable|after:1970-01-02|before:2038-01-17',
         ];
 
         return Location::requestRules($rules);

app/Api/V1/Requests/System/CronRequest.php

@@ -73,7 +73,7 @@ class CronRequest extends FormRequest
     {
         return [
             'force' => 'in:true,false',
-            'date'  => 'nullable|date|after:1900-01-01|before:2099-12-31',
+            'date'  => 'nullable|date|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V2/Controllers/Controller.php

@@ -116,7 +116,7 @@ class Controller extends BaseController
                     app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr((string) $date, 0, 20), $e->getMessage()));
                 }
                 // out of range? set to null.
-                if ($obj instanceof Carbon && ($obj->year <= 1900 || $obj->year > 2099)) {
+                if ($obj instanceof Carbon && ($obj->year <= 1970 || $obj->year > 2038)) {
                     app('log')->warning(sprintf('Refuse to use date "%s" in API v2 controller parameter check: %s', $field, $obj->toAtomString()));
                     $obj = null;
                 }

app/Api/V2/Request/Autocomplete/AutocompleteRequest.php

@@ -86,7 +86,7 @@ class AutocompleteRequest extends FormRequest
         $valid = array_keys($this->types);
 
         return [
-            'date'              => 'nullable|date|after:1900-01-01|before:2100-01-01',
+            'date'              => 'nullable|date|after:1970-01-02|before:2038-01-17',
             'query'             => 'nullable|string',
             'size'              => 'nullable|integer|min:1|max:100',
             'page'              => 'nullable|integer|min:1',

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -60,8 +60,8 @@ class BalanceChartRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'required|date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'start'      => 'required|date|after:1970-01-02|before:2038-01-17',
+            'end'        => 'required|date|after_or_equal:start|before:2038-01-17|after:1970-01-02',
             'accounts.*' => 'required|exists:accounts,id',
             'period'     => sprintf('required|in:%s', implode(',', config('firefly.valid_view_ranges'))),
         ];

app/Api/V2/Request/Chart/ChartRequest.php

@@ -61,8 +61,8 @@ class ChartRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'       => 'required|date|after:1900-01-01|before:2099-12-31|before_or_equal:end',
-            'end'         => 'required|date|after:1900-01-01|before:2099-12-31|after_or_equal:start',
+            'start'       => 'required|date|after:1970-01-02|before:2038-01-17|before_or_equal:end',
+            'end'         => 'required|date|after:1970-01-02|before:2038-01-17|after_or_equal:start',
             'preselected' => sprintf('nullable|in:%s', implode(',', config('firefly.preselected_accounts'))),
             'period'      => sprintf('nullable|in:%s', implode(',', config('firefly.valid_view_ranges'))),
             'accounts.*'  => 'exists:accounts,id',

app/Api/V2/Request/Chart/DashboardChartRequest.php

@@ -60,8 +60,8 @@ class DashboardChartRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'       => 'required|date|after:1900-01-01|before:2099-12-31',
-            'end'         => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'start'       => 'required|date|after:1970-01-02|before:2038-01-17',
+            'end'         => 'required|date|after_or_equal:start|before:2038-01-17|after:1970-01-02',
             'preselected' => sprintf('in:%s', implode(',', config('firefly.preselected_accounts'))),
             'accounts.*'  => 'exists:accounts,id',
         ];

app/Api/V2/Request/Generic/DateRequest.php

@@ -55,8 +55,8 @@ class DateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'required|date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+            'start' => 'required|date|after:1970-01-02|before:2038-01-17',
+            'end'   => 'required|date|after_or_equal:start|before:2038-01-17|after:1970-01-02',
         ];
     }
 }

app/Api/V2/Request/Generic/SingleDateRequest.php

@@ -53,7 +53,7 @@ class SingleDateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Api/V2/Request/Model/Account/IndexRequest.php

@@ -63,9 +63,9 @@ class IndexRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'date|after:1900-01-01|before:2099-12-31',
-            'start' => 'date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
-            'end'   => 'date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
+            'date'  => 'date|after:1970-01-02|before:2038-01-17',
+            'start' => 'date|after:1970-01-02|before:2038-01-17|before:end|required_with:end',
+            'end'   => 'date|after:1970-01-02|before:2038-01-17|after:start|required_with:start',
         ];
     }
 }

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -109,8 +109,8 @@ class InfiniteListRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'     => 'date|after:1900-01-01|before:2099-12-31',
-            'end'       => 'date|after:start|after:1900-01-01|before:2099-12-31',
+            'start'     => 'date|after:1970-01-02|before:2038-01-17',
+            'end'       => 'date|after:start|after:1970-01-02|before:2038-01-17',
             'start_row' => 'integer|min:0|max:4294967296',
             'end_row'   => 'integer|min:0|max:4294967296|gt:start_row',
         ];

app/Api/V2/Request/Model/Transaction/ListRequest.php

@@ -84,8 +84,8 @@ class ListRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'date|after:start|after:1900-01-01|before:2099-12-31',
+            'start' => 'date|after:1970-01-02|before:2038-01-17',
+            'end'   => 'date|after:start|after:1970-01-02|before:2038-01-17',
         ];
     }
 }

app/Factory/TagFactory.php

@@ -75,15 +75,15 @@ class TagFactory
         $latitude  = 0.0 === (float) $data['latitude'] ? null : (float) $data['latitude'];   // intentional float
         $longitude = 0.0 === (float) $data['longitude'] ? null : (float) $data['longitude']; // intentional float
         $array     = [
-            'user_id'       => $this->user->id,
-            'user_group_id' => $this->userGroup->id,
-            'tag'           => trim((string) $data['tag']),
-            'tagMode'       => 'nothing',
-            'date'          => $data['date'],
-            'description'   => $data['description'],
-            'latitude'      => null,
-            'longitude'     => null,
-            'zoomLevel'     => null,
+            'user_id'        => $this->user->id,
+            'user_group_id'  => $this->userGroup->id,
+            'tag'            => trim((string) $data['tag']),
+            'tag_mode'       => 'nothing',
+            'date'           => $data['date'],
+            'description'    => $data['description'],
+            'latitude'       => null,
+            'longitude'      => null,
+            'zoomLevel'      => null,
         ];
 
         /** @var null|Tag $tag */

app/Generator/Webhook/StandardMessageGenerator.php

@@ -32,11 +32,14 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookMessage;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Ramsey\Uuid\Uuid;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
@@ -59,14 +62,14 @@ class StandardMessageGenerator implements MessageGeneratorInterface
 
     public function generateMessages(): void
     {
-        app('log')->debug(__METHOD__);
+        Log::debug(__METHOD__);
         // get the webhooks:
         if (0 === $this->webhooks->count()) {
             $this->webhooks = $this->getWebhooks();
         }
 
         // do some debugging
-        app('log')->debug(
+        Log::debug(
             sprintf('StandardMessageGenerator will generate messages for %d object(s) and %d webhook(s).', $this->objects->count(), $this->webhooks->count())
         );
         $this->run();
@@ -79,13 +82,13 @@ class StandardMessageGenerator implements MessageGeneratorInterface
 
     private function run(): void
     {
-        app('log')->debug('Now in StandardMessageGenerator::run');
+        Log::debug('Now in StandardMessageGenerator::run');
 
         /** @var Webhook $webhook */
         foreach ($this->webhooks as $webhook) {
             $this->runWebhook($webhook);
         }
-        app('log')->debug('Done with StandardMessageGenerator::run');
+        Log::debug('Done with StandardMessageGenerator::run');
     }
 
     /**
@@ -93,7 +96,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
      */
     private function runWebhook(Webhook $webhook): void
     {
-        app('log')->debug(sprintf('Now in runWebhook(#%d)', $webhook->id));
+        Log::debug(sprintf('Now in runWebhook(#%d)', $webhook->id));
 
         /** @var Model $object */
         foreach ($this->objects as $object) {
@@ -108,7 +111,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
     {
         $class        = $model::class;
         // Line is ignored because all of Firefly III's Models have an id property.
-        app('log')->debug(sprintf('Now in generateMessage(#%d, %s#%d)', $webhook->id, $class, $model->id));
+        Log::debug(sprintf('Now in generateMessage(#%d, %s#%d)', $webhook->id, $class, $model->id));
 
         $uuid         = Uuid::uuid4();
         $basicMessage = [
@@ -125,7 +128,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         switch ($class) {
             default:
                 // Line is ignored because all of Firefly III's Models have an id property.
-                app('log')->error(
+                Log::error(
                     sprintf('Webhook #%d was given %s#%d to deal with but can\'t extract user ID from it.', $webhook->id, $class, $model->id)
                 );
 
@@ -141,7 +144,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         // then depends on the response what to put in the message:
         switch ($webhook->response) {
             default:
-                app('log')->error(
+                Log::error(
                     sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response)
                 );
 
@@ -159,10 +162,10 @@ class StandardMessageGenerator implements MessageGeneratorInterface
                 try {
                     $basicMessage['content'] = $transformer->transformObject($model);
                 } catch (FireflyException $e) {
-                    app('log')->error(
+                    Log::error(
                         sprintf('The transformer could not include the requested transaction group for webhook #%d: %s', $webhook->id, $e->getMessage())
                     );
-                    app('log')->error($e->getTraceAsString());
+                    Log::error($e->getTraceAsString());
 
                     return;
                 }
@@ -172,6 +175,10 @@ class StandardMessageGenerator implements MessageGeneratorInterface
             case WebhookResponse::ACCOUNTS->value:
                 /** @var TransactionGroup $model */
                 $accounts                = $this->collectAccounts($model);
+                $enrichment              = new AccountEnrichment();
+                $enrichment->setUser($model->user);
+                $enrichment->setNative(Amount::getNativeCurrencyByUserGroup($model->userGroup));
+                $accounts                = $enrichment->enrich($accounts);
                 foreach ($accounts as $account) {
                     $transformer               = new AccountTransformer();
                     $transformer->setParameters(new ParameterBag());
@@ -210,7 +217,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $webhookMessage->uuid    = $message['uuid'];
         $webhookMessage->message = $message;
         $webhookMessage->save();
-        app('log')->debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
+        Log::debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
     }
 
     public function setObjects(Collection $objects): void

app/Helpers/Collector/GroupCollector.php

@@ -434,6 +434,7 @@ class GroupCollector implements GroupCollectorInterface
 
     public function findNothing(): GroupCollectorInterface
     {
+        Log::warning('The search engine was instructed to FIND NOTHING. This may be a bug.');
         $this->query->where('transaction_groups.id', -1);
 
         return $this;
@@ -1094,6 +1095,10 @@ class GroupCollector implements GroupCollectorInterface
             ->whereNull('transaction_groups.deleted_at')
             ->whereNull('transaction_journals.deleted_at')
             ->whereNull('source.deleted_at')
+
+            // #10507 ignore opening balance.
+            ->where('transaction_types.type', '!=', TransactionTypeEnum::OPENING_BALANCE->value)
+
             ->whereNotNull('transaction_groups.id')
             ->whereNull('destination.deleted_at')
             ->orderBy('transaction_journals.date', 'DESC')

app/Helpers/Report/NetWorth.php

@@ -82,7 +82,7 @@ class NetWorth implements NetWorthInterface
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
+            //            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
             $currency                           = $this->accountRepository->getAccountCurrency($account) ?? $default;
             $useNative                          = $convertToNative && $default->id !== $currency->id;
             $currency                           = $useNative ? $default : $currency;
@@ -93,12 +93,12 @@ class NetWorth implements NetWorthInterface
                 $balance       = $balances[$account->id]['balance'] ?? '0';
                 $nativeBalance = $balances[$account->id]['native_balance'] ?? '0';
             }
-            Log::debug(sprintf('Balance is %s, native balance is %s', $balance, $nativeBalance));
+            //            Log::debug(sprintf('Balance is %s, native balance is %s', $balance, $nativeBalance));
             // always subtract virtual balance again.
             $balance                            = '' !== (string) $account->virtual_balance ? bcsub($balance, (string) $account->virtual_balance) : $balance;
             $nativeBalance                      = '' !== (string) $account->native_virtual_balance ? bcsub($nativeBalance, (string) $account->native_virtual_balance) : $nativeBalance;
             $amountToUse                        = $useNative ? $nativeBalance : $balance;
-            Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));
+            //            Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));
 
             $netWorth[$currencyCode] ??= [
                 'balance'                 => '0',

app/Http/Controllers/Controller.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use function Safe\realpath;
-use function Safe\ini_get;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -38,6 +36,9 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Route;
 
+use function Safe\realpath;
+use function Safe\ini_get;
+
 /**
  * Class Controller.
  *
@@ -78,12 +79,12 @@ abstract class Controller extends BaseController
         View::share('featuringWebhooks', true === config('firefly.feature_flags.webhooks') && true === config('firefly.allow_webhooks'));
 
         // share custom auth guard info.
-        $authGuard = config('firefly.authentication_guard');
-        $logoutUrl = config('firefly.custom_logout_url');
+        $authGuard        = config('firefly.authentication_guard');
+        $logoutUrl        = config('firefly.custom_logout_url');
 
         // overrule v2 layout back to v1.
         if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
-            //config('view.layout','v1');
+            // config('view.layout','v1');
             Config::set('view.layout', 'v1');
             View::getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
@@ -92,15 +93,15 @@ abstract class Controller extends BaseController
         View::share('logoutUrl', $logoutUrl);
 
         // upload size
-        $maxFileSize = Steam::phpBytes((string) ini_get('upload_max_filesize'));
-        $maxPostSize = Steam::phpBytes((string) ini_get('post_max_size'));
-        $uploadSize  = min($maxFileSize, $maxPostSize);
+        $maxFileSize      = Steam::phpBytes((string) ini_get('upload_max_filesize'));
+        $maxPostSize      = Steam::phpBytes((string) ini_get('post_max_size'));
+        $uploadSize       = min($maxFileSize, $maxPostSize);
         View::share('uploadSize', $uploadSize);
 
         // share is alpha, is beta
-        $isAlpha   = false;
-        $isBeta    = false;
-        $isDevelop = false;
+        $isAlpha          = false;
+        $isBeta           = false;
+        $isDevelop        = false;
         if (str_contains((string) config('firefly.version'), 'alpha')) {
             $isAlpha = true;
         }
@@ -118,7 +119,7 @@ abstract class Controller extends BaseController
 
         $this->middleware(
             function ($request, $next): mixed {
-                $locale = Steam::getLocale();
+                $locale                  = Steam::getLocale();
                 // translations for specific strings:
                 $this->monthFormat       = (string) trans('config.month_js', [], $locale);
                 $this->monthAndDayFormat = (string) trans('config.month_and_day_js', [], $locale);

app/Http/Controllers/Json/RecurrenceController.php

@@ -107,7 +107,7 @@ class RecurrenceController extends Controller
             $repetitionMoment = str_ireplace('ndom,', '', $request->get('type'));
         }
         if ('yearly' === $repetitionType) {
-            $repetitionMoment = explode(',', (string) $request->get('type'))[1] ?? '2018-01-01';
+            $repetitionMoment = explode(',', (string) $request->get('type'))[1] ?? '2025-01-01';
         }
         $actualStart->startOfDay();
         $repetition                    = new RecurrenceRepetition();

app/Http/Kernel.php

@@ -178,7 +178,7 @@ class Kernel extends HttpKernel
             'api'                   => [
                 AcceptHeaders::class,
                 EnsureFrontendRequestsAreStateful::class,
-                'auth:api',
+                'auth:api,sanctum',
                 'bindings',
             ],
             // do only bindings, no auth

app/Http/Middleware/Authenticate.php

@@ -97,6 +97,9 @@ class Authenticate
         }
 
         foreach ($guards as $guard) {
+            if ('api' !== $guard) {
+                $this->auth->guard($guard)->authenticate();
+            }
             $result = $this->auth->guard($guard)->check();
             if ($result) {
                 $user = $this->auth->guard($guard)->user();
@@ -107,7 +110,7 @@ class Authenticate
             }
         }
 
-        // this is a massive hack, but if the hander has the oauth exception
+        // this is a massive hack, but if the handler has the oauth exception
         // at this point we can report its error instead of a generic one.
         $message = 'Unauthenticated.';
         if (Handler::$lastError instanceof OAuthServerException) {

app/Http/Requests/SelectTransactionsRequest.php

@@ -41,8 +41,8 @@ class SelectTransactionsRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'required|date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
-            'end'        => 'required|date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
+            'start'      => 'required|date|after:1970-01-02|before:2038-01-17|before:end|required_with:end',
+            'end'        => 'required|date|after:1970-01-02|before:2038-01-17|after:start|required_with:start',
             'accounts'   => 'required',
             'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
         ];

app/Http/Requests/TagFormRequest.php

@@ -74,7 +74,7 @@ class TagFormRequest extends FormRequest
             'tag'         => $tagRule,
             'id'          => $idRule,
             'description' => 'max:32768|min:1|nullable',
-            'date'        => 'date|nullable|after:1984-09-17',
+            'date'        => 'date|nullable|after:1970-01-02|before:2038-01-17',
         ];
 
         return Location::requestRules($rules);

app/Models/Tag.php

@@ -40,7 +40,7 @@ class Tag extends Model
     use ReturnsIntegerUserIdTrait;
     use SoftDeletes;
 
-    protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tagMode'];
+    protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'date_tz', 'description', 'tag_mode'];
 
     protected $hidden   = ['zoomLevel', 'latitude', 'longitude'];
 

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -440,6 +440,8 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,
 
         /** @var TransactionJournal $journal */
         foreach ($group->transactionJournals as $journal) {
+            $names = sprintf('%s%s', $names, $journal->date->format('Y-m-d-H:i:s'));
+
             /** @var Transaction $transaction */
             foreach ($journal->transactions as $transaction) {
                 if (-1 === bccomp('0', (string)$transaction->amount)) {

app/Support/Authentication/RemoteUserGuard.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Authentication;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Guard;
@@ -86,14 +87,14 @@ class RemoteUserGuard implements Guard
 
         if (null !== $header) {
             $emailAddress = (string) (request()->server($header) ?? apache_request_headers()[$header] ?? null);
-            $preference   = app('preferences')->getForUser($retrievedUser, 'remote_guard_alt_email');
+            $preference   = Preferences::getForUser($retrievedUser, 'remote_guard_alt_email');
 
             if ('' !== $emailAddress && null === $preference && $emailAddress !== $userID) {
-                app('preferences')->setForUser($retrievedUser, 'remote_guard_alt_email', $emailAddress);
+                Preferences::setForUser($retrievedUser, 'remote_guard_alt_email', $emailAddress);
             }
             // if the pref isn't null and the object returned isn't null, update the email address.
             if ('' !== $emailAddress && null !== $preference && $emailAddress !== $preference->data) {
-                app('preferences')->setForUser($retrievedUser, 'remote_guard_alt_email', $emailAddress);
+                Preferences::setForUser($retrievedUser, 'remote_guard_alt_email', $emailAddress);
             }
         }
 

app/Support/Cronjobs/AutoBudgetCronjob.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Cronjobs;
 use Carbon\Carbon;
 use FireflyIII\Jobs\CreateAutoBudgetLimits;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;
 
 /**
  * Class AutoBudgetCronjob
@@ -36,7 +37,7 @@ class AutoBudgetCronjob extends AbstractCronjob
     public function fire(): void
     {
         /** @var Configuration $config */
-        $config        = app('fireflyconfig')->get('last_ab_job', 0);
+        $config        = FireflyConfig::get('last_ab_job', 0);
         $lastTime      = (int) $config->data;
         $diff          = Carbon::now()->getTimestamp() - $lastTime;
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
@@ -78,7 +79,7 @@ class AutoBudgetCronjob extends AbstractCronjob
         $this->jobSucceeded = true;
         $this->message      = 'Auto-budget cron job fired successfully.';
 
-        app('fireflyconfig')->set('last_ab_job', (int) $this->date->format('U'));
+        FireflyConfig::set('last_ab_job', (int) $this->date->format('U'));
         app('log')->info('Done with auto budget cron job task.');
     }
 }

app/Support/Form/CurrencyForm.php

@@ -50,9 +50,9 @@ class CurrencyForm
     }
 
     /**
-     * @throws FireflyException
-     *
      * @phpstan-param view-string $view
+     *
+     * @throws FireflyException
      */
     protected function currencyField(string $name, string $view, mixed $value = null, ?array $options = null): string
     {

app/Support/Http/Controllers/AugumentData.php

@@ -106,7 +106,7 @@ trait AugumentData
     {
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
-        $accounts   = $repository->getAccountsByType([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);
+        $accounts   = $repository->getAccountsByType([AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value]);
         $grouped    = $accounts->groupBy('id')->toArray();
         $return     = [];
         foreach ($accountIds as $combinedId) {

app/Support/Http/Controllers/PeriodOverview.php

@@ -70,7 +70,7 @@ trait PeriodOverview
     protected JournalRepositoryInterface $journalRepos;
 
     /**
-     * This method returns "period entries", so nov-2015, dec-2015, etc etc (this depends on the users session range)
+     * This method returns "period entries", so nov-2015, dec-2015, etc. (this depends on the users session range)
      * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
      * performance reasons.
      *
@@ -97,18 +97,26 @@ trait PeriodOverview
         /** @var array $dates */
         $dates                   = app('navigation')->blockPeriods($start, $end, $range);
         $entries                 = [];
+        $spent                   = [];
+        $earned                  = [];
+        $transferredAway         = [];
+        $transferredIn           = [];
 
         // run a custom query because doing this with the collector is MEGA slow.
         $transactions            = $this->accountRepository->periodCollection($account, $start, $end);
 
         // loop dates
         Log::debug(sprintf('Count of loops: %d', count($dates)));
+        $loops                   = 0;
+        // stop after 10 loops for memory reasons.
         foreach ($dates as $currentDate) {
             $title                            = app('navigation')->periodShow($currentDate['start'], $currentDate['period']);
-            [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
-            [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
+            if ($loops < 10) {
+                [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
+                [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
+            }
             $entries[]
                                               = [
                                                   'title'              => $title,
@@ -119,6 +127,7 @@ trait PeriodOverview
                                                   'transferred_away'   => $this->groupByCurrency($transferredAway),
                                                   'transferred_in'     => $this->groupByCurrency($transferredIn),
                                               ];
+            ++$loops;
         }
         $cache->store($entries);
         Timer::stop('account-period-total');
@@ -548,27 +557,29 @@ trait PeriodOverview
         /** @var array $dates */
         $dates         = app('navigation')->blockPeriods($start, $end, $range);
         $entries       = [];
-
+        $spent         = [];
+        $earned        = [];
+        $transferred   = [];
         // collect all journals in this period (regardless of type)
         $collector     = app(GroupCollectorInterface::class);
         $collector->setTypes($types)->setRange($start, $end);
         $genericSet    = $collector->getExtractedJournals();
+        $loops         = 0;
 
         foreach ($dates as $currentDate) {
-            $spent       = [];
-            $earned      = [];
-            $transferred = [];
             $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
 
-            // set to correct array
-            if ('expenses' === $transactionType || 'withdrawal' === $transactionType) {
-                $spent = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-            }
-            if ('revenue' === $transactionType || 'deposit' === $transactionType) {
-                $earned = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
-            }
-            if ('transfer' === $transactionType || 'transfers' === $transactionType) {
-                $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+            if ($loops < 10) {
+                // set to correct array
+                if ('expenses' === $transactionType || 'withdrawal' === $transactionType) {
+                    $spent = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
+                if ('revenue' === $transactionType || 'deposit' === $transactionType) {
+                    $earned = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
+                if ('transfer' === $transactionType || 'transfers' === $transactionType) {
+                    $transferred = $this->filterJournalsByDate($genericSet, $currentDate['start'], $currentDate['end']);
+                }
             }
             $entries[]
                          = [
@@ -579,6 +590,7 @@ trait PeriodOverview
                              'earned'             => $this->groupByCurrency($earned),
                              'transferred'        => $this->groupByCurrency($transferred),
                          ];
+            ++$loops;
         }
 
         return $entries;

app/Support/Http/Controllers/RequestInformation.php

@@ -34,7 +34,7 @@ use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Route as RouteFacade;
-use Hash;
+use Illuminate\Support\Facades\Hash;
 
 use function Safe\parse_url;
 

app/Support/Navigation.php

@@ -582,7 +582,7 @@ class Navigation
      */
     public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
     {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
             return 'endOfMonth';
         }
 
@@ -599,7 +599,7 @@ class Navigation
      */
     public function preferredRangeFormat(Carbon $start, Carbon $end): string
     {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
             return '1M';
         }
 
@@ -616,7 +616,7 @@ class Navigation
      */
     public function preferredSqlFormat(Carbon $start, Carbon $end): string
     {
-        if ((int) $start->diffInMonths($end, true) > 1) {
+        if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) {
             return '%Y-%m';
         }
 

app/Support/Report/Summarizer/TransactionSummarizer.php

@@ -71,12 +71,12 @@ class TransactionSummarizer
             $foreignCurrencyDecimalPlaces = null;
 
             if ($this->convertToNative) {
-                Log::debug('convertToNative is true.');
+                //                Log::debug('convertToNative is true.');
                 // if convert to native, use the native amount yes or no?
                 $useNative  = $this->default->id !== (int) $journal['currency_id'];
                 $useForeign = $this->default->id === (int) $journal['foreign_currency_id'];
                 if ($useNative) {
-                    Log::debug(sprintf('Journal #%d switches to native amount (original is %s)', $journal['transaction_journal_id'], $journal['currency_code']));
+                    //                    Log::debug(sprintf('Journal #%d switches to native amount (original is %s)', $journal['transaction_journal_id'], $journal['currency_code']));
                     $field                 = 'native_amount';
                     $currencyId            = $this->default->id;
                     $currencyName          = $this->default->name;
@@ -85,7 +85,7 @@ class TransactionSummarizer
                     $currencyDecimalPlaces = $this->default->decimal_places;
                 }
                 if ($useForeign) {
-                    Log::debug(sprintf('Journal #%d switches to foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
+                    //                    Log::debug(sprintf('Journal #%d switches to foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
                     $field                 = 'foreign_amount';
                     $currencyId            = (int) $journal['foreign_currency_id'];
                     $currencyName          = $journal['foreign_currency_name'];
@@ -95,7 +95,7 @@ class TransactionSummarizer
                 }
             }
             if (!$this->convertToNative) {
-                Log::debug('convertToNative is false.');
+                //                Log::debug('convertToNative is false.');
                 // use foreign amount?
                 $foreignCurrencyId = (int) $journal['foreign_currency_id'];
                 if (0 !== $foreignCurrencyId) {

app/Support/Steam.php

@@ -342,7 +342,7 @@ class Steam
 
             return $cache->get();
         }
-        Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
+        // Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
         if (null === $convertToNative) {
             $convertToNative = Amount::convertToNative($account->user);
         }
@@ -401,7 +401,7 @@ class Steam
             // Log::debug(sprintf('Virtual balance makes the (native) total %s', $return['balance']));
         }
         $final             = array_merge($return, $others);
-        Log::debug('Final balance is', $final);
+        // Log::debug('Final balance is', $final);
         $cache->store($final);
 
         return $final;

app/TransactionRules/Actions/SetDescription.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Traits\RefreshNotesTrait;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class SetDescription.
@@ -51,7 +52,12 @@ class SetDescription implements ActionInterface
         $after  = $this->action->getValue($journal);
 
         // replace newlines.
-        $after  = str_replace(["\r", "\n", "\t", "\036", "\025"], '', $after);
+        $after  = trim(str_replace(["\r", "\n", "\t", "\036", "\025"], '', $after));
+
+        if ('' === $after) {
+            Log::warning('Action resulted in an empty description, reset to default value.');
+            $after = '(no description)';
+        }
 
         DB::table('transaction_journals')
             ->where('id', '=', $journal['transaction_journal_id'])

changelog.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.20 - 2025-07-02
+
+### Changed
+
+- New query parser is now the default.
+
+### Fixed
+
+- [Issue 10517](https://github.com/firefly-iii/firefly-iii/issues/10517) (401 when trying to create personal access token with Remote user authentication) reported by @MaxPelly
+- [Discussion 10530](https://github.com/orgs/firefly-iii/discussions/10530) (Find and delete transactions with empty descriptions) started by @umfk
+- [Issue 10535](https://github.com/firefly-iii/firefly-iii/issues/10535) (Internal Firefly III Exception: Undefined array key "currency") reported by @MaelFr
+
+## 6.2.19 - 2025-06-29
+
+### Changed
+
+- Currency seeder adds "CNY" again, because it turns out "RMB" is not the official, ISO 4217 code for the Chinese Yuan.
+- The "period overview" next to the transaction lists (withdrawals, deposits and transfers) is limited to 10 entries because it uses a lot of memory. I still have to fix this.
+
+### Removed
+
+- Support for ntfy, since the underlying library is no longer maintained. Will be replaced in the future.
+
+### Fixed
+
+- Running balance calculation also triggers on edit.
+- [Issue 10489](https://github.com/firefly-iii/firefly-iii/issues/10489) (Cannot create personal access token if using remote guard auth in latest version) reported by @Palomox
+- [Issue 10493](https://github.com/firefly-iii/firefly-iii/issues/10493) (Reports First Graph Wrong) reported by @nicolopozzato
+- [Issue 10499](https://github.com/firefly-iii/firefly-iii/issues/10499) (Password change results in error 500 (Class "Hash" not found)) reported by @willermo
+- [Issue 10507](https://github.com/firefly-iii/firefly-iii/issues/10507) (Opening balance transactions includes in `has_no_category` filter) reported by @lompi
+- [Issue 10510](https://github.com/firefly-iii/firefly-iii/issues/10510) (Liability accounts show as 'no name' on budget transaction report pie chart.) reported by @slackspace-io
+
 ## 6.2.18 - 2025-06-20
 
 ### Changed

composer.lock

@@ -1879,16 +1879,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.19.3",
+            "version": "v12.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262"
+                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
-                "reference": "4e6ec689ef704bb4bd282f29d9dd658dfb4fb262",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/1b9a00f8caf5503c92aa436279172beae1a484ff",
+                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff",
                 "shasum": ""
             },
             "require": {
@@ -2090,7 +2090,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-06-18T12:56:23+00:00"
+            "time": "2025-07-08T15:02:21+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2170,16 +2170,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.5",
+            "version": "v0.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
-                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/86a8b692e8661d0fb308cec64f3d176821323077",
+                "reference": "86a8b692e8661d0fb308cec64f3d176821323077",
                 "shasum": ""
             },
             "require": {
@@ -2223,22 +2223,22 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.5"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.6"
             },
-            "time": "2025-02-11T13:34:40+00:00"
+            "time": "2025-07-07T14:17:42+00:00"
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.1.1",
+            "version": "v4.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "a360a6a1fd2400ead4eb9b6a9c1bb272939194f5"
+                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/a360a6a1fd2400ead4eb9b6a9c1bb272939194f5",
-                "reference": "a360a6a1fd2400ead4eb9b6a9c1bb272939194f5",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
+                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
                 "shasum": ""
             },
             "require": {
@@ -2289,7 +2289,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2025-04-23T13:03:38+00:00"
+            "time": "2025-07-01T15:49:32+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2354,16 +2354,16 @@
         },
         {
             "name": "laravel/slack-notification-channel",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/slack-notification-channel.git",
-                "reference": "b9448136c2e93f51f0d603d05d6bf64412e5727c"
+                "reference": "642677a57490eebccb7e9fb666f5a5379c6e3459"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/b9448136c2e93f51f0d603d05d6bf64412e5727c",
-                "reference": "b9448136c2e93f51f0d603d05d6bf64412e5727c",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/642677a57490eebccb7e9fb666f5a5379c6e3459",
+                "reference": "642677a57490eebccb7e9fb666f5a5379c6e3459",
                 "shasum": ""
             },
             "require": {
@@ -2413,9 +2413,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/slack-notification-channel/issues",
-                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.5.0"
+                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.6.0"
             },
-            "time": "2025-02-23T14:43:55+00:00"
+            "time": "2025-06-26T16:51:38+00:00"
         },
         {
             "name": "laravel/ui",
@@ -2808,16 +2808,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.23.0",
+            "version": "9.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "774008ad8a634448e4f8e288905e070e8b317ff3"
+                "reference": "e0221a3f16aa2a823047d59fab5809d552e29bc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/774008ad8a634448e4f8e288905e070e8b317ff3",
-                "reference": "774008ad8a634448e4f8e288905e070e8b317ff3",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/e0221a3f16aa2a823047d59fab5809d552e29bc8",
+                "reference": "e0221a3f16aa2a823047d59fab5809d552e29bc8",
                 "shasum": ""
             },
             "require": {
@@ -2827,14 +2827,14 @@
             "require-dev": {
                 "ext-dom": "*",
                 "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^3.69.0",
-                "phpbench/phpbench": "^1.4.0",
-                "phpstan/phpstan": "^1.12.18",
+                "friendsofphp/php-cs-fixer": "^3.75.0",
+                "phpbench/phpbench": "^1.4.1",
+                "phpstan/phpstan": "^1.12.27",
                 "phpstan/phpstan-deprecation-rules": "^1.2.1",
                 "phpstan/phpstan-phpunit": "^1.4.2",
                 "phpstan/phpstan-strict-rules": "^1.6.2",
-                "phpunit/phpunit": "^10.5.16 || ^11.5.7",
-                "symfony/var-dumper": "^6.4.8 || ^7.2.3"
+                "phpunit/phpunit": "^10.5.16 || ^11.5.22",
+                "symfony/var-dumper": "^6.4.8 || ^7.3.0"
             },
             "suggest": {
                 "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
@@ -2895,7 +2895,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-28T06:52:04+00:00"
+            "time": "2025-06-25T14:53:51+00:00"
         },
         {
             "name": "league/event",
@@ -2953,16 +2953,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.29.1",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
-                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
+                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
                 "shasum": ""
             },
             "require": {
@@ -2986,13 +2986,13 @@
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
-                "ext-mongodb": "^1.3",
+                "ext-mongodb": "^1.3|^2",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
                 "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
-                "mongodb/mongodb": "^1.2",
+                "mongodb/mongodb": "^1.2|^2",
                 "phpseclib/phpseclib": "^3.0.36",
                 "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^9.5.11|^10.0",
@@ -3030,22 +3030,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
             },
-            "time": "2024-10-08T08:58:34+00:00"
+            "time": "2025-06-25T13:29:59+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.29.0",
+            "version": "3.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
-                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
+                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
                 "shasum": ""
             },
             "require": {
@@ -3079,9 +3079,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
             },
-            "time": "2024-08-09T21:24:39+00:00"
+            "time": "2025-05-21T10:34:19+00:00"
         },
         {
             "name": "league/fractal",
@@ -3711,16 +3711,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.0",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
-                "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
+                "reference": "1fd1935b2d90aef2f093c5e35f7ae1257c448d00",
                 "shasum": ""
             },
             "require": {
@@ -3812,7 +3812,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-12T10:24:28+00:00"
+            "time": "2025-06-21T15:19:35+00:00"
         },
         {
             "name": "nette/schema",
@@ -3964,16 +3964,16 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.8.1",
+            "version": "v8.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5"
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
-                "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
+                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
                 "shasum": ""
             },
             "require": {
@@ -4059,7 +4059,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-06-11T01:04:21+00:00"
+            "time": "2025-06-25T02:12:12+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -4805,16 +4805,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.44",
+            "version": "3.0.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "1d0b5e7e1434678411787c5a0535e68907cf82d9"
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1d0b5e7e1434678411787c5a0535e68907cf82d9",
-                "reference": "1d0b5e7e1434678411787c5a0535e68907cf82d9",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
+                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
                 "shasum": ""
             },
             "require": {
@@ -4895,7 +4895,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.44"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46"
             },
             "funding": [
                 {
@@ -4911,7 +4911,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-15T09:59:26+00:00"
+            "time": "2025-06-26T16:29:55+00:00"
         },
         {
             "name": "pragmarx/google2fa",
@@ -5745,21 +5745,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.8.1",
+            "version": "4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
-                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
-                "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -5818,9 +5817,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
             },
-            "time": "2025-06-01T06:28:46+00:00"
+            "time": "2025-06-25T14:20:11+00:00"
         },
         {
             "name": "rcrowe/twigbridge",
@@ -6408,16 +6407,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "c4b217b578c11ec764867aa0c73e602c602965de"
+                "reference": "a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/c4b217b578c11ec764867aa0c73e602c602965de",
-                "reference": "c4b217b578c11ec764867aa0c73e602c602965de",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e",
+                "reference": "a7c6caa9d6113cebfb3020b427bcb021ebfdfc9e",
                 "shasum": ""
             },
             "require": {
@@ -6486,7 +6485,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.3.0"
+                "source": "https://github.com/symfony/cache/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -6502,7 +6501,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-06T19:00:13+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -6656,16 +6655,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
-                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9e27aecde8f506ba0fd1d9989620c04a87697101",
+                "reference": "9e27aecde8f506ba0fd1d9989620c04a87697101",
                 "shasum": ""
             },
             "require": {
@@ -6730,7 +6729,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -6746,7 +6745,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T10:34:04+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6882,16 +6881,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83"
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf68d225bc43629de4ff54778029aee6dc191b83",
-                "reference": "cf68d225bc43629de4ff54778029aee6dc191b83",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/35b55b166f6752d6aaf21aa042fc5ed280fce235",
+                "reference": "35b55b166f6752d6aaf21aa042fc5ed280fce235",
                 "shasum": ""
             },
             "require": {
@@ -6939,7 +6938,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.3.0"
+                "source": "https://github.com/symfony/error-handler/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -6955,7 +6954,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-13T07:48:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -7243,16 +7242,16 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9"
+                "reference": "4403d87a2c16f33345dca93407a8714ee8c05a64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/57e4fb86314015a695a750ace358d07a7e37b8a9",
-                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/4403d87a2c16f33345dca93407a8714ee8c05a64",
+                "reference": "4403d87a2c16f33345dca93407a8714ee8c05a64",
                 "shasum": ""
             },
             "require": {
@@ -7264,6 +7263,7 @@
             },
             "conflict": {
                 "amphp/amp": "<2.5",
+                "amphp/socket": "<1.1",
                 "php-http/discovery": "<1.15",
                 "symfony/http-foundation": "<6.4"
             },
@@ -7276,7 +7276,6 @@
             "require-dev": {
                 "amphp/http-client": "^4.2.1|^5.0",
                 "amphp/http-tunnel": "^1.0|^2.0",
-                "amphp/socket": "^1.1",
                 "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
@@ -7318,7 +7317,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-client/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7334,7 +7333,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-02T08:23:16+00:00"
+            "time": "2025-06-28T07:58:39+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -7416,16 +7415,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "4236baf01609667d53b20371486228231eb135fd"
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4236baf01609667d53b20371486228231eb135fd",
-                "reference": "4236baf01609667d53b20371486228231eb135fd",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/23dd60256610c86a3414575b70c596e5deff6ed9",
+                "reference": "23dd60256610c86a3414575b70c596e5deff6ed9",
                 "shasum": ""
             },
             "require": {
@@ -7475,7 +7474,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7491,20 +7490,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-12T14:48:23+00:00"
+            "time": "2025-06-23T15:07:14+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f"
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ac7b8e163e8c83dce3abcc055a502d4486051a9f",
-                "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1644879a66e4aa29c36fe33dfa6c54b450ce1831",
+                "reference": "1644879a66e4aa29c36fe33dfa6c54b450ce1831",
                 "shasum": ""
             },
             "require": {
@@ -7589,7 +7588,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.0"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7605,20 +7604,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:47:32+00:00"
+            "time": "2025-06-28T08:24:55+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c"
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/0f375bbbde96ae8c78e4aa3e63aabd486e33364c",
-                "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368",
                 "shasum": ""
             },
             "require": {
@@ -7669,7 +7668,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.0"
+                "source": "https://github.com/symfony/mailer/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7685,20 +7684,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-04T09:51:09+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/mailgun-mailer",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "3c1dfd9ff0a487a4116baec42d11ae21a061e3f1"
+                "reference": "8c18f2bff4e70ed5669ab8228302edd2fecd689b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/3c1dfd9ff0a487a4116baec42d11ae21a061e3f1",
-                "reference": "3c1dfd9ff0a487a4116baec42d11ae21a061e3f1",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/8c18f2bff4e70ed5669ab8228302edd2fecd689b",
+                "reference": "8c18f2bff4e70ed5669ab8228302edd2fecd689b",
                 "shasum": ""
             },
             "require": {
@@ -7738,7 +7737,7 @@
             "description": "Symfony Mailgun Mailer Bridge",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.3.0"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -7754,7 +7753,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-28T08:24:38+00:00"
+            "time": "2025-06-20T16:15:52+00:00"
         },
         {
             "name": "symfony/mime",
@@ -8941,16 +8940,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667"
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4aba29076a29a3aa667e09b791e5f868973a8667",
-                "reference": "4aba29076a29a3aa667e09b791e5f868973a8667",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/241d5ac4910d256660238a7ecf250deba4c73063",
+                "reference": "241d5ac4910d256660238a7ecf250deba4c73063",
                 "shasum": ""
             },
             "require": {
@@ -9017,7 +9016,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.0"
+                "source": "https://github.com/symfony/translation/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -9033,7 +9032,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-29T07:19:49+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -9115,16 +9114,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3"
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
-                "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/a69f69f3159b852651a6bf45a9fdd149520525bb",
+                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb",
                 "shasum": ""
             },
             "require": {
@@ -9169,7 +9168,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.3.0"
+                "source": "https://github.com/symfony/uid/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -9185,20 +9184,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-24T14:28:13+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.3.0",
+            "version": "v7.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e"
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/548f6760c54197b1084e1e5c71f6d9d523f2f78e",
-                "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
+                "reference": "6e209fbe5f5a7b6043baba46fe5735a4b85d0d42",
                 "shasum": ""
             },
             "require": {
@@ -9253,7 +9252,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.0"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.1"
             },
             "funding": [
                 {
@@ -9269,7 +9268,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-27T18:39:23+00:00"
+            "time": "2025-06-27T19:55:54+00:00"
         },
         {
             "name": "symfony/var-exporter",
@@ -10472,16 +10471,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.4.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404"
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/36706736a0c51d3337478fab9c919d78d2e03404",
-                "reference": "36706736a0c51d3337478fab9c919d78d2e03404",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/e8ccd73008487ba91da9877b373f8c447743f1ce",
+                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce",
                 "shasum": ""
             },
             "require": {
@@ -10549,7 +10548,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.4.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -10557,7 +10556,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-10T09:34:58+00:00"
+            "time": "2025-06-19T22:41:50+00:00"
         },
         {
             "name": "laravel-json-api/testing",
@@ -10709,16 +10708,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.1",
+            "version": "1.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
-                "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36",
+                "reference": "faed855a7b5f4d4637717c2b3863e277116beb36",
                 "shasum": ""
             },
             "require": {
@@ -10757,7 +10756,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3"
             },
             "funding": [
                 {
@@ -10765,7 +10764,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-29T12:36:36+00:00"
+            "time": "2025-07-05T12:25:42+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -11550,16 +11549,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.2.2",
+            "version": "12.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "19e25c2da3f8071a683ee1e445b0e24bba25de61"
+                "reference": "8b1348b254e5959acaf1539c6bd790515fb49414"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/19e25c2da3f8071a683ee1e445b0e24bba25de61",
-                "reference": "19e25c2da3f8071a683ee1e445b0e24bba25de61",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8b1348b254e5959acaf1539c6bd790515fb49414",
+                "reference": "8b1348b254e5959acaf1539c6bd790515fb49414",
                 "shasum": ""
             },
             "require": {
@@ -11569,17 +11568,17 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.1",
+                "myclabs/deep-copy": "^1.13.3",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.0",
+                "phpunit/php-code-coverage": "^12.3.1",
                 "phpunit/php-file-iterator": "^6.0.0",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
                 "phpunit/php-timer": "^8.0.0",
                 "sebastian/cli-parser": "^4.0.0",
-                "sebastian/comparator": "^7.0.1",
+                "sebastian/comparator": "^7.1.0",
                 "sebastian/diff": "^7.0.0",
                 "sebastian/environment": "^8.0.2",
                 "sebastian/exporter": "^7.0.0",
@@ -11627,7 +11626,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.2"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.7"
             },
             "funding": [
                 {
@@ -11651,20 +11650,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-13T05:49:28+00:00"
+            "time": "2025-07-11T04:11:13+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "2.0.18",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "be3a452085b524a04056e3dfe72d861948711062"
+                "reference": "d0917c069bb0d9bb06ed111cf052510f609015a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/be3a452085b524a04056e3dfe72d861948711062",
-                "reference": "be3a452085b524a04056e3dfe72d861948711062",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d0917c069bb0d9bb06ed111cf052510f609015a4",
+                "reference": "d0917c069bb0d9bb06ed111cf052510f609015a4",
                 "shasum": ""
             },
             "require": {
@@ -11694,6 +11693,7 @@
                 "MIT"
             ],
             "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "homepage": "https://getrector.com/",
             "keywords": [
                 "automation",
                 "dev",
@@ -11702,7 +11702,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.0.18"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.1"
             },
             "funding": [
                 {
@@ -11710,7 +11710,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-11T11:19:37+00:00"
+            "time": "2025-07-10T11:31:31+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/firefly.php

@@ -78,7 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.2.18',
+    'version'                      => 'develop/2025-07-14',
+    'build_time'                   => 1752464049,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

config/notifications.php

@@ -26,7 +26,7 @@ return [
     'channels'      => [
         'email'    => ['enabled' => true, 'ui_configurable' => 0],
         'slack'    => ['enabled' => true, 'ui_configurable' => 1],
-        'ntfy'     => ['enabled' => false, 'ui_configurable' => 1],
+        // 'ntfy'     => ['enabled' => false, 'ui_configurable' => 1],
         'pushover' => ['enabled' => true, 'ui_configurable' => 1],
         //        'gotify'     => ['enabled' => false, 'ui_configurable' => 0],
         //        'pushbullet' => ['enabled' => false, 'ui_configurable' => 0],

config/search.php

@@ -260,8 +260,6 @@ return [
         'destination_balance_lt'                                  => ['alias' => false, 'needs_context' => true],
         'destination_balance_is'                                  => ['alias' => false, 'needs_context' => true],
     ],
-    /**
-     * Which query parser to use - 'new' or 'legacy'
-     */
+    // Which query parser to use - 'new' or 'legacy'
     'query_parser'     => env('QUERY_PARSER_IMPLEMENTATION', 'legacy'),
 ];

database/migrations/2025_07_10_065736_rename_tag_mode.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        try {
+            // normal case
+            Schema::table('tags', static function (Blueprint $table): void {
+                if (Schema::hasColumn('tags', 'tagMode') && !Schema::hasColumn('piggy_banks', 'tag_mode')) {
+                    $table->renameColumn('tagMode', 'tag_mode');
+                }
+            });
+            // lower case just in case (haha)
+            Schema::table('tags', static function (Blueprint $table): void {
+                if (Schema::hasColumn('tags', 'tagmode') && !Schema::hasColumn('piggy_banks', 'tag_mode')) {
+                    $table->renameColumn('tagmode', 'tag_mode');
+                }
+            });
+        } catch (RuntimeException $e) {
+            Log::error(sprintf('Could not rename column: %s', $e->getMessage()));
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        try {
+            Schema::table('tags', static function (Blueprint $table): void {
+                if (Schema::hasColumn('tags', 'tag_mode') && !Schema::hasColumn('piggy_banks', 'tagMode')) {
+                    $table->renameColumn('tag_mode', 'tagMode');
+                }
+            });
+        } catch (RuntimeException $e) {
+            Log::error(sprintf('Could not rename column: %s', $e->getMessage()));
+        }
+    }
+};

database/seeders/TransactionCurrencySeeder.php

@@ -66,8 +66,8 @@ class TransactionCurrencySeeder extends Seeder
 
         // asian currencies
         $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 0];
-        // $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
-        $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
+        //        $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
         $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2];
         $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2];
 

resources/assets/v1/src/locales/ca.json

@@ -1,11 +1,11 @@
 {
     "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
-        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_title": "Administracions financeres",
+        "administrations_index_menu": "Administracions financeres",
+        "expires_at": "Caduca a les",
+        "temp_administrations_introduction": "Firefly III aviat podr\u00e0 gestionar diverses administracions financeres. Ara mateix, nom\u00e9s en teniu una. Podeu definir el t\u00edtol d'aquesta administraci\u00f3 i la seva moneda nativa. Aix\u00f2 substitueix la configuraci\u00f3 anterior on definiu la vostra \"moneda predeterminada\". Aquesta configuraci\u00f3 ara est\u00e0 vinculada a l'administraci\u00f3 financera i pot ser diferent per a cada administraci\u00f3.",
+        "administration_currency_form_help": "La p\u00e0gina pot trigar molt a carregar-se si canvieu la moneda nativa, ja que pot ser que la transacci\u00f3 s'hagi de convertir a la vostra (nova) moneda nativa.",
+        "administrations_page_edit_sub_title_js": "Edita l'administraci\u00f3 financera \"{title}\"",
         "table": "Taula",
         "welcome_back": "Qu\u00e8 est\u00e0 passant?",
         "flash_error": "Error!",
@@ -16,11 +16,11 @@
         "select_source_account": "Per favor, selecciona o escriu un nom de compte d'origen v\u00e0lid",
         "split_transaction_title": "Descripci\u00f3 de la transacci\u00f3 dividida",
         "errors_submission": "Hi ha hagut un error amb el teu enviament. Per favor, revisa els errors de sota.",
-        "is_reconciled": "Is reconciled",
+        "is_reconciled": "Est\u00e0 reconciliat",
         "split": "Dividir",
         "single_split": "Divisi\u00f3",
-        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies": "No hi ha prou monedes",
+        "not_enough_currencies_enabled": "Si tens nom\u00e9s una divisa habilitada, no cal afegir tipus de canvi.",
         "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">Transacci\u00f3 #{ID} (\"{title}\")<\/a> s'ha desat.",
         "webhook_stored_link": "S'ha desat <a href=\"webhooks\/show\/{ID}\">el Webook #{ID} (\"{title}\")<\/a> correctament.",
         "webhook_updated_link": "S'ha actualitzat el <a href=\"webhooks\/show\/{ID}\">Webook #{ID}<\/a> (\"{title}\").",
@@ -31,7 +31,7 @@
         "apply_rules_checkbox": "Aplicar regles",
         "fire_webhooks_checkbox": "Disparar webhooks",
         "no_budget_pointer": "Sembla que encara no tens cap pressupost. N'hauries de crear alguns a la p\u00e0gina de <a href=\"budgets\">pressuposts<\/a>. Els pressupostos et poden ajudar a fer el seguiment de les teves despeses.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Sembla que encara no tens cap subscripci\u00f3. N'hauries de crear alguns a la p\u00e0gina de <a href=\"subscriptions\">subscripcions<\/a>. Les subscripcions et poden ajudar a fer el seguiment de les teves despeses.",
         "source_account": "Compte d'origen",
         "hidden_fields_preferences": "Pots habilitar m\u00e9s opcions de transacci\u00f3 a la <a href=\"preferences\">configuraci\u00f3<\/a>.",
         "destination_account": "Compte de dest\u00ed",
@@ -43,10 +43,10 @@
         "submit": "Enviar",
         "amount": "Import",
         "date": "Data",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
+        "is_reconciled_fields_dropped": "Com que aquesta transacci\u00f3 est\u00e0 reconciliada, no podreu actualitzar els comptes ni l'import o imports tret que elimineu el senyalador de reconciliaci\u00f3.",
         "tags": "Etiquetes",
         "no_budget": "(cap pressupost)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(cap subscripci\u00f3)",
         "category": "Categoria",
         "attachments": "Adjunts",
         "notes": "Notes",
@@ -62,7 +62,7 @@
         "destination_account_reconciliation": "No pots editar el compte de dest\u00ed d'una transacci\u00f3 de reconciliaci\u00f3.",
         "source_account_reconciliation": "No pots editar el compte d'origen d'una transacci\u00f3 de consolidaci\u00f3.",
         "budget": "Pressupost",
-        "bill": "Subscription",
+        "bill": "Subscripci\u00f3",
         "you_create_withdrawal": "Est\u00e0s creant una retirada.",
         "you_create_transfer": "Est\u00e0s creant una transfer\u00e8ncia.",
         "you_create_deposit": "Est\u00e0s creant un ingr\u00e9s.",
@@ -140,21 +140,21 @@
         "response": "Resposta",
         "visit_webhook_url": "Visitar l'URL del webhook",
         "reset_webhook_secret": "Reiniciar el secret del webhook",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates": "Tipus de canvi",
+        "exchange_rates_intro": "Firefly III permet descarregar i utilitzar tipus de canvi. M\u00e9s informaci\u00f3 sobre aix\u00f2 a la <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">documentaci\u00f3<\/a>.",
+        "exchange_rates_from_to": "Entre {from} i {to} (i a la inversa)",
+        "exchange_rates_intro_rates": "Firefly III utilitza els tipus de canvi seg\u00fcents. L'invers es calcula autom\u00e0ticament quan no es proporciona. Si no existeix cap tipus de canvi per a la data de la transacci\u00f3, Firefly III tornar\u00e0 enrere en el temps per trobar-ne un. Si no n'hi ha cap, s'utilitzar\u00e0 el tipus \"1\".",
+        "header_exchange_rates_rates": "Tipus de canvi",
+        "header_exchange_rates_table": "Taula amb els tipus de canvi",
+        "help_rate_form": "El dia d'avui, quants {to} obtindr\u00e0s amb un {from}?",
+        "add_new_rate": "Afegeix un nou tipus de canvi",
+        "save_new_rate": "Desa nou tipus"
     },
     "form": {
         "url": "URL",
         "active": "Actiu",
         "interest_date": "Data d'inter\u00e8s",
-        "administration_currency": "Native currency",
+        "administration_currency": "Moneda nativa",
         "title": "T\u00edtol",
         "date": "Data",
         "book_date": "Data de registre",
@@ -169,12 +169,12 @@
         "webhook_delivery": "Lliurament",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Taxa"
     },
     "list": {
         "title": "T\u00edtol",
         "active": "Est\u00e0 actiu?",
-        "native_currency": "Native currency",
+        "native_currency": "Moneda nativa",
         "trigger": "Activador",
         "response": "Resposta",
         "delivery": "Lliurament",

resources/assets/v1/src/locales/cs.json

@@ -40,13 +40,13 @@
         "stored_journal": "\u00dasp\u011b\u0161n\u011b vytvo\u0159ena nov\u00e1 transakce \u201e:description\u201c",
         "create_another": "Po ulo\u017een\u00ed se vr\u00e1tit sem pro vytvo\u0159en\u00ed dal\u0161\u00ed.",
         "reset_after": "Po odesl\u00e1n\u00ed vymazat obsah formul\u00e1\u0159e",
-        "submit": "Odeslat",
+        "submit": "Potvrdit",
         "amount": "\u010c\u00e1stka",
         "date": "Datum",
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
         "tags": "\u0160t\u00edtky",
         "no_budget": "(\u017e\u00e1dn\u00fd rozpo\u010det)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(bez pravideln\u00e9 platby)",
         "category": "Kategorie",
         "attachments": "P\u0159\u00edlohy",
         "notes": "Pozn\u00e1mky",
@@ -62,7 +62,7 @@
         "destination_account_reconciliation": "C\u00edlov\u00fd \u00fa\u010det odsouhlasen\u00e9 transakce nelze upravit.",
         "source_account_reconciliation": "Nem\u016f\u017eete upravovat zdrojov\u00fd \u00fa\u010det srovn\u00e1vac\u00ed transakce.",
         "budget": "Rozpo\u010det",
-        "bill": "Subscription",
+        "bill": "Pravideln\u00e1 platba",
         "you_create_withdrawal": "Vytv\u00e1\u0159\u00edte v\u00fdb\u011br.",
         "you_create_transfer": "Vytv\u00e1\u0159\u00edte p\u0159evod.",
         "you_create_deposit": "Vytv\u00e1\u0159\u00edte vklad.",
@@ -72,7 +72,7 @@
         "profile_whoops": "Omlouv\u00e1me se, tohle n\u011bjak nefunguje",
         "profile_something_wrong": "Something went wrong!",
         "profile_try_again": "Something went wrong. Please try again.",
-        "profile_oauth_clients": "OAuth Clients",
+        "profile_oauth_clients": "Klienti OAuth",
         "profile_oauth_no_clients": "Zat\u00edm jste nevytvo\u0159ili OAuth klienty.",
         "profile_oauth_clients_header": "Klienti",
         "profile_oauth_client_id": "ID z\u00e1kazn\u00edka",
@@ -123,7 +123,7 @@
         "create_new_webhook": "Vytvo\u0159it nov\u00fd webhook",
         "webhooks": "Webhooky",
         "webhook_trigger_form_help": "Ur\u010dit, na kterou ud\u00e1lost se spust\u00ed webhook",
-        "webhook_response_form_help": "Ur\u010dit, co mus\u00ed webhook odeslat do URL.",
+        "webhook_response_form_help": "Ur\u010dete, co mus\u00ed webhook odeslat do URL.",
         "webhook_delivery_form_help": "V jak\u00e9m form\u00e1tu mus\u00ed webhook pos\u00edlat data.",
         "webhook_active_form_help": "Webhook mus\u00ed b\u00fdt aktivn\u00ed, nebo nebude zavol\u00e1n.",
         "edit_webhook_js": "Upravit webhook \"{title}\"",

resources/assets/v1/src/locales/es.json

@@ -1,11 +1,11 @@
 {
     "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
-        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_title": "Administraciones financieras",
+        "administrations_index_menu": "Administraciones financieras",
+        "expires_at": "Expira el",
+        "temp_administrations_introduction": "Firefly III pronto tendr\u00e1 la capacidad de gestionar m\u00faltiples administraciones financieras. Ahora mismo, solo tienes uno. Puedes establecer el t\u00edtulo de esta administraci\u00f3n y su moneda nativa. Esto reemplaza la configuraci\u00f3n anterior donde establecer\u00eda su \"moneda predeterminada\". Esta situaci\u00f3n est\u00e1 vinculada ahora a la administraci\u00f3n financiera y puede ser diferente por administraci\u00f3n.",
+        "administration_currency_form_help": "Puede tardar mucho tiempo en cargar la p\u00e1gina si cambia la moneda nativa porque la transacci\u00f3n puede necesitar ser convertida a su (nueva) moneda nativa.",
+        "administrations_page_edit_sub_title_js": "Editar administraci\u00f3n financiera \"{title}\"",
         "table": "Mesa",
         "welcome_back": "\u00bfQu\u00e9 est\u00e1 pasando?",
         "flash_error": "\u00a1Error!",
@@ -16,11 +16,11 @@
         "select_source_account": "Por favor, seleccione o escriba un nombre de cuenta de origen v\u00e1lido",
         "split_transaction_title": "Descripci\u00f3n de la transacci\u00f3n dividida",
         "errors_submission": "Hubo un problema con su env\u00edo. Por favor, compruebe los siguientes errores.",
-        "is_reconciled": "Is reconciled",
+        "is_reconciled": "Est\u00e1 reconciliado",
         "split": "Separar",
         "single_split": "Divisi\u00f3n",
-        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies": "No hay suficientes monedas",
+        "not_enough_currencies_enabled": "Si solo tiene una divisa habilitada, no es necesario a\u00f1adir tipos de cambio.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">La transacci\u00f3n #{ID} (\"{title}\")<\/a> ha sido almacenada.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">El webhook #{ID} (\"{title}\")<\/a> ha sido almacenado.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">El webhook #{ID} (\"{title}\")<\/a> ha sido actualizado.",
@@ -43,10 +43,10 @@
         "submit": "Enviar",
         "amount": "Cantidad",
         "date": "Fecha",
-        "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
+        "is_reconciled_fields_dropped": "Debido a que esta transacci\u00f3n est\u00e1 reconciliada, no podr\u00e1 actualizar las cuentas, ni la cantidad(es) a menos que elimine la bandera de reconciliaci\u00f3n.",
         "tags": "Etiquetas",
         "no_budget": "(sin presupuesto)",
-        "no_bill": "(no subscription)",
+        "no_bill": "(sin suscripci\u00f3n)",
         "category": "Categor\u00eda",
         "attachments": "Archivos adjuntos",
         "notes": "Notas",
@@ -62,7 +62,7 @@
         "destination_account_reconciliation": "No puedes editar la cuenta de destino de una transacci\u00f3n de reconciliaci\u00f3n.",
         "source_account_reconciliation": "No puedes editar la cuenta de origen de una transacci\u00f3n de reconciliaci\u00f3n.",
         "budget": "Presupuesto",
-        "bill": "Subscription",
+        "bill": "Suscripci\u00f3n",
         "you_create_withdrawal": "Est\u00e1 creando un gasto.",
         "you_create_transfer": "Est\u00e1 creando una transferencia.",
         "you_create_deposit": "Est\u00e1 creando un ingreso.",
@@ -140,11 +140,11 @@
         "response": "Respuesta",
         "visit_webhook_url": "Visita la URL del webhook",
         "reset_webhook_secret": "Restablecer secreto del webhook",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "header_exchange_rates": "Tipos de cambio",
+        "exchange_rates_intro": "Firefly III soporta la descarga y el uso de tipos de cambio. Lee m\u00e1s sobre esto en <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">la documentaci\u00f3n<\/a>.",
         "exchange_rates_from_to": "Entre {from} y {to} (y viceversa)",
         "exchange_rates_intro_rates": "Firefly III utiliza los siguientes tipos de cambio. El inverso se calcula autom\u00e1ticamente cuando no se proporciona. Si no existe un tipo de cambio para la fecha de la transacci\u00f3n, Firefly III retroceder\u00e1 en el tiempo para encontrar uno. Si no hay ninguno presente, se usar\u00e1 la tasa \"1\".",
-        "header_exchange_rates_rates": "Exchange rates",
+        "header_exchange_rates_rates": "Tipos de cambio",
         "header_exchange_rates_table": "Tabla con tipos de cambio",
         "help_rate_form": "En este d\u00eda, \u00bfcu\u00e1nto {to} conseguir\u00e1s por un {from}?",
         "add_new_rate": "Agregar un nuevo tipo de cambio",
@@ -174,7 +174,7 @@
     "list": {
         "title": "T\u00edtulo",
         "active": "\u00bfEst\u00e1 Activo?",
-        "native_currency": "Native currency",
+        "native_currency": "Moneda nativa",
         "trigger": "Disparador",
         "response": "Respuesta",
         "delivery": "Entrega",

resources/assets/v1/src/locales/zh-cn.json

@@ -2,7 +2,7 @@
     "firefly": {
         "administrations_page_title": "\u8d22\u52a1\u7ba1\u7406",
         "administrations_index_menu": "\u8d22\u52a1\u7ba1\u7406",
-        "expires_at": "Expires at",
+        "expires_at": "\u8fc7\u671f\u4e8e",
         "temp_administrations_introduction": "Firefly III \u4e0d\u4e45\u5c06\u80fd\u591f\u7ba1\u7406\u591a\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002 \u73b0\u5728\uff0c\u4f60\u53ea\u80fd\u6709\u4e00\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002\u4f60\u53ef\u4ee5\u8bbe\u7f6e\u8fd9\u4e2a\u8d22\u52a1\u7ba1\u7406\u7684\u6807\u9898\u53ca\u5176\u5f53\u5730\u8d27\u5e01\u3002 \u8fd9\u5c06\u53d6\u4ee3\u60a8\u5148\u524d\u8bbe\u7f6e\u7684\u201c\u9ed8\u8ba4\u8d27\u5e01\u201d\u3002 \u8fd9\u79cd\u8bbe\u7f6e\u73b0\u5728\u4e0e\u8d22\u52a1\u7ba1\u7406\u6302\u94a9\uff0c\u6bcf\u4e2a\u7ba1\u7406\u53ef\u4ee5\u6709\u4e0d\u540c\u7684\u8bbe\u7f6e\u3002",
         "administration_currency_form_help": "\u5982\u679c\u60a8\u66f4\u6539\u672c\u5730\u8d27\u5e01\uff0c\u9875\u9762\u52a0\u8f7d\u53ef\u80fd\u9700\u8981\u5f88\u957f\u65f6\u95f4\uff0c\u56e0\u4e3a\u4ea4\u6613\u53ef\u80fd\u9700\u8981\u8f6c\u6362\u4e3a\u60a8\u7684(\u65b0)\u672c\u5730\u8d27\u5e01\u3002",
         "administrations_page_edit_sub_title_js": "\u7f16\u8f91\u8d22\u52a1\u7ba1\u7406{title}",

resources/lang/en_US/firefly.php

@@ -133,7 +133,7 @@ return [
     'expenses_by_budget'                                                        => 'Expenses by budget',
     'income_by_category'                                                        => 'Income by category',
     'expenses_by_asset_account'                                                 => 'Expenses by asset account',
-    'expenses_by_expense_account'                                               => 'Expenses by expense account',
+    'expenses_by_expense_account'                                               => 'Expenses by destination account',
     'cannot_redirect_to_account'                                                => 'Firefly III cannot redirect you to the correct page. Apologies.',
     'sum_of_expenses'                                                           => 'Sum of expenses',
     'sum_of_income'                                                             => 'Sum of income',

resources/lang/en_US/form.php

@@ -64,7 +64,7 @@ return [
     'budget_id'                    => 'Budget',
     'bill_id'                      => 'Subscription',
     'opening_balance'              => 'Opening balance',
-    'tagMode'                      => 'Tag mode',
+    'tag_mode'                      => 'Tag mode',
     'virtual_balance'              => 'Virtual balance',
 
 

resources/views/accounts/reconcile/show.twig

@@ -82,13 +82,13 @@
                                     {% for tag in journal.tags %}
 
                                         <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}">
-                                                {% if tag.tagMode == 'nothing' %}
+                                                {% if tag.tag_mode == 'nothing' %}
                                                     <span class="fa fa-fw fa-tag"></span>
                                                 {% endif %}
-                                                {% if tag.tagMode == 'balancingAct' %}
+                                                {% if tag.tag_mode == 'balancingAct' %}
                                                     <span class="fa fa-fw fa-refresh"></span>
                                                 {% endif %}
-                                                {% if tag.tagMode == 'advancePayment' %}
+                                                {% if tag.tag_mode == 'advancePayment' %}
                                                     <span class="fa fa-fw fa-sort-numeric-desc"></span>
                                                 {% endif %}
                                                 {{ tag.tag }}</a>

tests/integration/Api/Autocomplete/AccountControllerTest.php

@@ -44,6 +44,6 @@ final class AccountControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.accounts'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 }

tests/integration/Api/Autocomplete/BillControllerTest.php

@@ -84,7 +84,7 @@ final class BillControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.bills'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 
     public function testGivenAuthenticatedRequestWhenCallingTheBillsEndpointThenReturns200HttpCode(): void

tests/integration/Api/Autocomplete/BudgetControllerTest.php

@@ -78,7 +78,7 @@ final class BudgetControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.budgets'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 
     public function testGivenAuthenticatedRequestWhenCallingTheBudgetsEndpointThenReturns200HttpCode(): void

tests/integration/Api/Autocomplete/CategoryControllerTest.php

@@ -77,7 +77,7 @@ final class CategoryControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.categories'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 
     public function testGivenAuthenticatedRequestWhenCallingTheCategoriesEndpointThenReturns200HttpCode(): void

tests/integration/Api/Autocomplete/CurrencyControllerTest.php

@@ -80,7 +80,7 @@ final class CurrencyControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.currencies'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 
     public function testGivenAuthenticatedRequestWhenCallingTheCurrenciesEndpointThenReturns200HttpCode(): void

tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php

@@ -78,7 +78,7 @@ final class ObjectGroupControllerTest extends TestCase
         $response = $this->get(route('api.v1.autocomplete.object-groups'), ['Accept' => 'application/json']);
         $response->assertStatus(401);
         $response->assertHeader('Content-Type', 'application/json');
-        $response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
+        $response->assertContent('{"message":"Unauthenticated.","exception":"AuthenticationException"}');
     }
 
     public function testGivenAuthenticatedRequestWhenCallingTheObjectGroupsEndpointThenReturns200HttpCode(): void

tests/integration/Support/Models/BillDateCalculatorTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\integration\Support\Models;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Models\BillDateCalculator;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -56,10 +55,10 @@ final class BillDateCalculatorTest extends TestCase
     public function testGivenSomeDataItWorks(Carbon $earliest, Carbon $latest, Carbon $billStart, string $period, int $skip, ?Carbon $lastPaid, array $expected): void
     {
         $result = $this->calculator->getPayDates($earliest, $latest, $billStart, $period, $skip, $lastPaid);
-        self::assertSame($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
-    public static function provideDates(): Iterator
+    public static function provideDates(): iterable
     {
         // Carbon $earliest, Carbon $latest, Carbon $billStart, string $period, int $skip, ?Carbon $lastPaid
         // basic monthly bill.x

tests/integration/Support/NavigationCustomEndOfPeriodTest.php

@@ -45,6 +45,6 @@ final class NavigationCustomEndOfPeriodTest extends TestCase
         $navigation = new Navigation();
 
         $period     = $navigation->endOfPeriod($from, 'custom');
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 }

tests/unit/Support/Calendar/CalculatorTest.php

@@ -73,7 +73,7 @@ final class CalculatorTest extends TestCase
     {
         $calculator = new Calculator();
         $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity);
-        self::assertSame($provider->expected()->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected()->toDateString(), $period->toDateString());
     }
 
     public static function provideAllPeriodicity(): iterable
@@ -102,7 +102,7 @@ final class CalculatorTest extends TestCase
     {
         $calculator = new Calculator();
         $period     = $calculator->nextDateByInterval($provider->epoch(), $provider->periodicity, $provider->skip);
-        self::assertSame($provider->expected()->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected()->toDateString(), $period->toDateString());
     }
 
     public static function provideSkippedIntervals(): iterable

tests/unit/Support/Calendar/Periodicity/IntervalTestCase.php

@@ -36,7 +36,7 @@ abstract class IntervalTestCase extends TestCase
     public function testGivenAnEpochWhenCallTheNextDateThenReturnsTheExpectedDateSuccessful(IntervalProvider $provider): void
     {
         $period = static::factory()->nextDate($provider->epoch);
-        self::assertSame($provider->expected->toDateString(), $period->toDateString());
+        $this->assertSame($provider->expected->toDateString(), $period->toDateString());
     }
 
     public static function provider(): iterable

tests/unit/Support/NavigationAddPeriodTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Calendar\Periodicity;
 use FireflyIII\Support\Navigation;
@@ -56,7 +55,7 @@ final class NavigationAddPeriodTest extends TestCase
     public function testGivenAFrequencyAndSkipIntervalWhenCalculateTheDateThenReturnsTheSkippedDateSuccessful(int $skip, string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, $skip);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
     public static function providePeriodsWithSkippingParam(): iterable
@@ -108,10 +107,10 @@ final class NavigationAddPeriodTest extends TestCase
     public function testGivenAFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, 0);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function providePeriods(): Iterator
+    public static function providePeriods(): iterable
     {
         yield '1D' => ['1D', Carbon::now(), Carbon::tomorrow()];
 
@@ -158,10 +157,10 @@ final class NavigationAddPeriodTest extends TestCase
     public function testGivenAIntervalWhenCallTheNextDateByIntervalMethodThenReturnsTheExpectedDateSuccessful(Periodicity $periodicity, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->nextDateByInterval($from, $periodicity);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function provideFrequencies(): Iterator
+    public static function provideFrequencies(): iterable
     {
         yield Periodicity::Daily->name => [Periodicity::Daily, Carbon::now(), Carbon::tomorrow()];
 
@@ -212,10 +211,10 @@ final class NavigationAddPeriodTest extends TestCase
     public function testGivenAMonthFrequencyWhenCalculateTheDateThenReturnsTheLastDayOfMonthSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->addPeriod($from, $frequency, 0);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function provideMonthPeriods(): Iterator
+    public static function provideMonthPeriods(): iterable
     {
         yield '1M' => ['1M', Carbon::parse('2023-06-25'), Carbon::parse('2023-06-25')->addMonthsNoOverflow(1)];
 

tests/unit/Support/NavigationEndOfPeriodTest.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use Illuminate\Support\Facades\Log;
@@ -55,10 +54,10 @@ final class NavigationEndOfPeriodTest extends TestCase
     public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = clone $this->navigation->endOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function provideDates(): Iterator
+    public static function provideDates(): iterable
     {
         yield '1D' => ['1D', Carbon::now(), Carbon::now()->endOfDay()];
 
@@ -116,13 +115,13 @@ final class NavigationEndOfPeriodTest extends TestCase
         Log::spy();
 
         $period          = $this->navigation->endOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
         $expectedMessage = sprintf('Cannot do endOfPeriod for $repeat_freq "%s"', $frequency);
 
         Log::shouldHaveReceived('error', [$expectedMessage]);
     }
 
-    public static function provideUnknownFrequencies(): Iterator
+    public static function provideUnknownFrequencies(): iterable
     {
         yield '1day' => ['1day', Carbon::now(), Carbon::now()];
 

tests/unit/Support/NavigationPreferredCarbonFormatByPeriodTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use FireflyIII\Support\Navigation;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\integration\TestCase;
@@ -54,10 +53,10 @@ final class NavigationPreferredCarbonFormatByPeriodTest extends TestCase
     public function testGivenAPeriodWhenCallPreferredCarbonFormatByPeriodThenReturnsExpectedFormat(string $period, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredCarbonFormatByPeriod($period);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
     }
 
-    public static function providePeriods(): Iterator
+    public static function providePeriods(): iterable
     {
         yield 'unknown' => ['1day', 'Y-m-d'];
 

tests/unit/Support/NavigationPreferredCarbonFormatTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -55,10 +54,10 @@ final class NavigationPreferredCarbonFormatTest extends TestCase
     public function testGivenStartAndEndDatesWhenCallPreferredCarbonFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $carbonFormat = $this->navigation->preferredCarbonFormat($start, $end);
-        self::assertSame($expected, $carbonFormat);
+        $this->assertSame($expected, $carbonFormat);
     }
 
-    public static function providePeriods(): Iterator
+    public static function providePeriods(): iterable
     {
         yield '1 week' => [Carbon::now(), Carbon::now()->addWeek(), 'Y-m-d'];
 

tests/unit/Support/NavigationPreferredEndOfPeriodTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -55,10 +54,10 @@ final class NavigationPreferredEndOfPeriodTest extends TestCase
     public function testGivenStartAndEndDatesWhenCallPreferredEndOfPeriodThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredEndOfPeriod($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
     }
 
-    public static function providePeriods(): Iterator
+    public static function providePeriods(): iterable
     {
         yield '1 week' => [Carbon::now(), Carbon::now()->addWeek(), 'endOfDay'];
 

tests/unit/Support/NavigationPreferredRangeFormatTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -55,10 +54,10 @@ final class NavigationPreferredRangeFormatTest extends TestCase
     public function testGivenStartAndEndDatesWhenCallPreferredRangeFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredRangeFormat($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
     }
 
-    public static function providePeriods(): Iterator
+    public static function providePeriods(): iterable
     {
         yield '1 week' => [Carbon::now(), Carbon::now()->addWeek(), '1D'];
 

tests/unit/Support/NavigationPreferredSqlFormatTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -55,10 +54,10 @@ final class NavigationPreferredSqlFormatTest extends TestCase
     public function testGivenStartAndEndDatesWhenCallPreferredSqlFormatThenReturnsTheExpectedFormatSuccessful(Carbon $start, Carbon $end, string $expected): void
     {
         $formatPeriod = $this->navigation->preferredSqlFormat($start, $end);
-        self::assertSame($expected, $formatPeriod);
+        $this->assertSame($expected, $formatPeriod);
     }
 
-    public static function provideDates(): Iterator
+    public static function provideDates(): iterable
     {
         yield '1 week' => [Carbon::now(), Carbon::now()->addWeek(), '%Y-%m-%d'];
 

tests/unit/Support/NavigationStartOfPeriodTest.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace Tests\unit\Support;
 
 use Override;
-use Iterator;
 use Carbon\Carbon;
 use FireflyIII\Support\Navigation;
 use Illuminate\Support\Facades\Log;
@@ -56,10 +55,10 @@ final class NavigationStartOfPeriodTest extends TestCase
     public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected): void
     {
         $period = $this->navigation->startOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function provideDates(): Iterator
+    public static function provideDates(): iterable
     {
         yield 'custom' => ['custom', Carbon::now(), Carbon::now()];
 
@@ -121,10 +120,10 @@ final class NavigationStartOfPeriodTest extends TestCase
         ;
 
         $period = $this->navigation->startOfPeriod($from, $frequency);
-        self::assertSame($expected->toDateString(), $period->toDateString());
+        $this->assertSame($expected->toDateString(), $period->toDateString());
     }
 
-    public static function provideUnknownFrequencies(): Iterator
+    public static function provideUnknownFrequencies(): iterable
     {
         yield '1day' => ['1day', Carbon::now(), Carbon::now()];
 

tests/unit/Support/Search/QueryParser/AbstractQueryParserInterfaceParseQueryTester.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tests\unit\Support\Search\QueryParser;
 
-use Iterator;
 use FireflyIII\Support\Search\QueryParser\FieldNode;
 use FireflyIII\Support\Search\QueryParser\QueryParserInterface;
 use FireflyIII\Support\Search\QueryParser\StringNode;
@@ -26,11 +25,11 @@ abstract class AbstractQueryParserInterfaceParseQueryTester extends TestCase
     {
         $actual = $this->createParser()->parse($query);
 
-        self::assertObjectEquals($expected, $actual);
+        $this->assertObjectEquals($expected, $actual);
 
     }
 
-    public static function queryDataProvider(): Iterator
+    public static function queryDataProvider(): iterable
     {
         yield 'empty query' => [
             '',