Compare commits

..

13 Commits

Author SHA1 Message Date
github-actions[bot]
5e68d948f3 Merge pull request #11874 from firefly-iii/release-1772634907
🤖 Automatically merge the PR into the develop branch.
2026-03-04 15:35:20 +01:00
JC5
77cae13b95 🤖 Auto commit for release 'develop' on 2026-03-04 2026-03-04 15:35:07 +01:00
Sander Dorigo
49d8a3c32e Catch not numeric numbers 2026-03-04 15:25:32 +01:00
github-actions[bot]
0ad4db8a71 Merge pull request #11872 from firefly-iii/release-1772618461
🤖 Automatically merge the PR into the develop branch.
2026-03-04 11:01:10 +01:00
JC5
ed9754c8d4 🤖 Auto commit for release 'develop' on 2026-03-04 2026-03-04 11:01:01 +01:00
Sander Dorigo
f8687d4fc1 New config 2026-03-04 10:01:24 +01:00
github-actions[bot]
93500b8156 Merge pull request #11869 from firefly-iii/release-1772607152
🤖 Automatically merge the PR into the develop branch.
2026-03-04 07:52:42 +01:00
JC5
8a3fb50607 🤖 Auto commit for release 'v6.5.3' on 2026-03-04 2026-03-04 07:52:32 +01:00
github-actions[bot]
8a8567c3e4 Merge pull request #11868 from firefly-iii/release-1772605365
🤖 Automatically merge the PR into the develop branch.
2026-03-04 07:22:52 +01:00
JC5
7922671463 🤖 Auto commit for release 'develop' on 2026-03-04 2026-03-04 07:22:45 +01:00
James Cole
3baa1ccd78 Update changelog. 2026-03-04 07:17:36 +01:00
James Cole
4beef8be86 Merge branch 'main' into develop 2026-03-04 07:14:11 +01:00
James Cole
912a9f1ea7 Fix workflow for now. 2026-03-04 06:53:52 +01:00
7 changed files with 39 additions and 19 deletions

View File

@@ -5,6 +5,7 @@ parameters:
- ../routes
- ../config
- ../bootstrap/app.php
- ../bootstrap/providers.php
universalObjectCratesClasses:
- Illuminate\Database\Eloquent\Model
reportUnmatchedIgnoredErrors: true

View File

@@ -179,13 +179,17 @@ jobs:
composer update --no-scripts --no-plugins -q
# format code.
echo "Will now run Mago Format"
mago format || true
sudo chown -R runner:docker resources/lang
echo "Will now run PHPCS"
.ci/phpcs.sh || true
# lint and check
mago lint
.ci/phpstan.sh
echo "Will now run Mago Lint"
mago lint || true
echo "Will now run PHPstan"
.ci/phpstan.sh || true
- name: Calculate variables
run: |

View File

@@ -143,7 +143,7 @@ final class AmountController extends Controller
/** @var Account $account */
foreach ($piggyBank->accounts as $account) {
$amount = (string) ($amounts[$account->id] ?? '0');
if ('' === $amount || 0 === bccomp($amount, '0')) {
if ('' === $amount || !is_numeric($amount) || 0 === bccomp($amount, '0')) {
continue;
}
if (-1 === bccomp($amount, '0')) {

View File

@@ -3,6 +3,21 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## 6.5.3 - 2026-03-05
This release fixes some sloppy coding on my part, but good news everyone! A new linter is in place that should prevent that from happening. Turns out I had disabled it in the past :(.
### Added
- Note about the EU origins of Firefly III.
### Changed
- [PR 11862](https://github.com/firefly-iii/firefly-iii/pull/11862) (Return currency info for tag journals) reported by @dakennguyen
- Expand code linting and checks.
### Fixed
- [Issue 11866](https://github.com/firefly-iii/firefly-iii/issues/11866) (ReflectionException on Transaction\ListRequest) reported by @brot
## 6.5.2 - 2026-03-04
### Changed

24
composer.lock generated
View File

@@ -1009,16 +1009,16 @@
},
{
"name": "firebase/php-jwt",
"version": "v6.11.1",
"version": "v7.0.3",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
"reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
"reference": "28aa0694bcfdfa5e2959c394d5a1ee7a5083629e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
"reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/28aa0694bcfdfa5e2959c394d5a1ee7a5083629e",
"reference": "28aa0694bcfdfa5e2959c394d5a1ee7a5083629e",
"shasum": ""
},
"require": {
@@ -1066,9 +1066,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
"source": "https://github.com/firebase/php-jwt/tree/v7.0.3"
},
"time": "2025-04-09T20:32:01+00:00"
"time": "2026-02-25T22:16:40+00:00"
},
{
"name": "fruitcake/php-cors",
@@ -2100,21 +2100,21 @@
},
{
"name": "laravel/passport",
"version": "v12.4.2",
"version": "v12.4.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
"reference": "65a885607b62d361aedaeb10a946bc6b5a954262"
"reference": "1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/65a885607b62d361aedaeb10a946bc6b5a954262",
"reference": "65a885607b62d361aedaeb10a946bc6b5a954262",
"url": "https://api.github.com/repos/laravel/passport/zipball/1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626",
"reference": "1d2e0170a52f150d5c35c9a6fc1f7ccebcde7626",
"shasum": ""
},
"require": {
"ext-json": "*",
"firebase/php-jwt": "^6.4",
"firebase/php-jwt": "^6.4|^7.0",
"illuminate/auth": "^9.21|^10.0|^11.0|^12.0",
"illuminate/console": "^9.21|^10.0|^11.0|^12.0",
"illuminate/container": "^9.21|^10.0|^11.0|^12.0",
@@ -2172,7 +2172,7 @@
"issues": "https://github.com/laravel/passport/issues",
"source": "https://github.com/laravel/passport"
},
"time": "2025-02-12T16:11:33+00:00"
"time": "2026-02-19T14:14:05+00:00"
},
{
"name": "laravel/prompts",

View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-03-04',
'build_time' => 1772603748,
'build_time' => 1772634704,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

6
package-lock.json generated
View File

@@ -7153,9 +7153,9 @@
}
},
"node_modules/i18next": {
"version": "25.8.13",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.13.tgz",
"integrity": "sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==",
"version": "25.8.14",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.14.tgz",
"integrity": "sha512-paMUYkfWJMsWPeE/Hejcw+XLhHrQPehem+4wMo+uELnvIwvCG019L9sAIljwjCmEMtFQQO3YeitJY8Kctei3iA==",
"funding": [
{
"type": "individual",