Compare commits

..

7 Commits

Author SHA1 Message Date
dependabot[bot]
f1fa0f5845 Bump phpunit/phpunit from 12.5.16 to 13.1.0
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 12.5.16 to 13.1.0.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/13.1.0/ChangeLog-13.1.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/12.5.16...13.1.0)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 13.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-06 04:07:51 +00:00
github-actions[bot]
dc2a13c2e9 Merge pull request #12092 from firefly-iii/release-1775448395
🤖 Automatically merge the PR into the develop branch.
2026-04-06 06:06:44 +02:00
JC5
667052ab6e 🤖 Auto commit for release 'develop' on 2026-04-06 2026-04-06 06:06:35 +02:00
James Cole
a5c653069a Clean up some code. 2026-04-04 18:54:57 +02:00
James Cole
cbbecf4a19 Replace unnecessary polyfills. 2026-04-04 05:56:23 +02:00
James Cole
b0d14177cc Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2026-04-04 05:56:12 +02:00
James Cole
6effbdb716 Fix https://github.com/firefly-iii/firefly-iii/issues/12083 2026-04-04 05:55:49 +02:00
7 changed files with 438 additions and 338 deletions

View File

@@ -1185,16 +1185,16 @@
},
{
"name": "sebastian/diff",
"version": "8.0.0",
"version": "8.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3"
"reference": "9c957d730257f49c873f3761674559bd90098a7d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
"reference": "a2b6d09d7729ee87d605a439469f9dcc39be5ea3",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/9c957d730257f49c873f3761674559bd90098a7d",
"reference": "9c957d730257f49c873f3761674559bd90098a7d",
"shasum": ""
},
"require": {
@@ -1207,7 +1207,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "8.0-dev"
"dev-main": "8.1-dev"
}
},
"autoload": {
@@ -1240,7 +1240,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy",
"source": "https://github.com/sebastianbergmann/diff/tree/8.0.0"
"source": "https://github.com/sebastianbergmann/diff/tree/8.1.0"
},
"funding": [
{
@@ -1260,7 +1260,7 @@
"type": "tidelift"
}
],
"time": "2026-02-06T04:42:27+00:00"
"time": "2026-04-05T12:02:33+00:00"
},
{
"name": "symfony/console",

View File

@@ -113,8 +113,9 @@ class StandardWebhookSender implements WebhookSenderInterface
return;
}
$options = [
'body' => $json,
'headers' => [
'body' => $json,
'allow_redirects' => false,
'headers' => [
'Content-Type' => 'application/json',
'Accept' => 'application/json',
'Signature' => $signature,

View File

@@ -123,11 +123,16 @@
"phpstan/phpstan": "^2",
"phpstan/phpstan-deprecation-rules": "^2",
"phpstan/phpstan-strict-rules": "^2",
"phpunit/phpunit": "^12",
"phpunit/phpunit": "^13",
"rector/rector": "^2.3",
"thecodingmachine/phpstan-safe-rule": "^1.4",
"ergebnis/phpstan-rules": "^2"
},
"replace": {
"symfony/polyfill-php54": "*",
"paragonie/sodium_compat": "*",
"symfony/polyfill-mbstring": "*"
},
"suggest": {},
"autoload": {

717
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-04-03',
'build_time' => 1775245142,
'version' => 'develop/2026-04-06',
'build_time' => 1775448191,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

18
package-lock.json generated
View File

@@ -3682,9 +3682,9 @@
"license": "MIT"
},
"node_modules/baseline-browser-mapping": {
"version": "2.10.14",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.14.tgz",
"integrity": "sha512-fOVLPAsFTsQfuCkvahZkzq6nf8KvGWanlYoTh0SVA0A/PIUxQGU2AOZAoD95n2gFLVDW/jP6sbGLny95nmEuHA==",
"version": "2.10.15",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.15.tgz",
"integrity": "sha512-1nfKCq9wuAZFTkA2ey/3OXXx7GzFjLdkTiFVNwlJ9WqdI706CZRIhEqjuwanjMIja+84jDLa9rcyZDPDiVkASQ==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -4134,9 +4134,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001784",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001784.tgz",
"integrity": "sha512-WU346nBTklUV9YfUl60fqRbU5ZqyXlqvo1SgigE1OAXK5bFL8LL9q1K7aap3N739l4BvNqnkm3YrGHiY9sfUQw==",
"version": "1.0.30001785",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001785.tgz",
"integrity": "sha512-blhOL/WNR+Km1RI/LCVAvA73xplXA7ZbjzI4YkMK9pa6T/P3F2GxjNpEkyw5repTw9IvkyrjyHpwjnhZ5FOvYQ==",
"dev": true,
"funding": [
{
@@ -9715,9 +9715,9 @@
"license": "MIT"
},
"node_modules/regjsparser": {
"version": "0.13.0",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
"integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
"version": "0.13.1",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.1.tgz",
"integrity": "sha512-dLsljMd9sqwRkby8zhO1gSg3PnJIBFid8f4CQj/sXx+7cKx+E7u0PKhZ+U4wmhx7EfmtvnA318oVaIkAB1lRJw==",
"dev": true,
"license": "BSD-2-Clause",
"dependencies": {

View File

@@ -382,11 +382,12 @@
{{ ExpandedForm.text('pushover_app_token', pushoverAppToken, {}) }}
{{ ExpandedForm.text('pushover_user_token', pushoverUserToken, {}) }}
{{ ExpandedForm.text('ntfy_server', ntfyServer, {}) }}
{{ ExpandedForm.text('ntfy_topic', ntfyTopic, {}) }}
{{ ExpandedForm.checkbox('ntfy_auth','1', ntfyAuth, {}) }}
{{ ExpandedForm.text('ntfy_user', ntfyUser, {}) }}
{{ ExpandedForm.passwordWithValue('ntfy_pass', ntfyPass, {autocomplete: 'off'}) }}
{{ Form.hidden('ntfy_server', ntfyServer, {}) }}
{{ Form.hidden('ntfy_topic', ntfyTopic, {}) }}
{{ Form.hidden('ntfy_auth','1', ntfyAuth, {}) }}
{{ Form.hidden('ntfy_user', ntfyUser, {}) }}
{{ Form.hidden('ntfy_pass', ntfyPass, {autocomplete: 'off'}) }}
<p>
{{ 'pref_notifications_settings_help'|_ }}
</p>