kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-29 06:34:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10303 from firefly-iii/release-1747228276

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2025-05-14 15:11:26 +02:00
committed by GitHub
parent a7233de561 a37ed82bb4
commit 75e187ee34
2 changed files with 75 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

271
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "404a3c73aa12057d75eaf3fb298d9a82", "content-hash": "7a6d00c913131e0264dd0943c5ddb5e0",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@@ -2094,44 +2094,43 @@
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
"version": "v13.0.1", "version": "v12.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/passport.git", "url": "https://github.com/laravel/passport.git",
"reference": "d96323a1c3699efe51ca477c3dd8fdd6500d7997" "reference": "65a885607b62d361aedaeb10a946bc6b5a954262"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/d96323a1c3699efe51ca477c3dd8fdd6500d7997", "url": "https://api.github.com/repos/laravel/passport/zipball/65a885607b62d361aedaeb10a946bc6b5a954262",
"reference": "d96323a1c3699efe51ca477c3dd8fdd6500d7997", "reference": "65a885607b62d361aedaeb10a946bc6b5a954262",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-openssl": "*",
"firebase/php-jwt": "^6.4", "firebase/php-jwt": "^6.4",
"illuminate/auth": "^11.35|^12.0", "illuminate/auth": "^9.21|^10.0|^11.0|^12.0",
"illuminate/console": "^11.35|^12.0", "illuminate/console": "^9.21|^10.0|^11.0|^12.0",
"illuminate/container": "^11.35|^12.0", "illuminate/container": "^9.21|^10.0|^11.0|^12.0",
"illuminate/contracts": "^11.35|^12.0", "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0",
"illuminate/cookie": "^11.35|^12.0", "illuminate/cookie": "^9.21|^10.0|^11.0|^12.0",
"illuminate/database": "^11.35|^12.0", "illuminate/database": "^9.21|^10.0|^11.0|^12.0",
"illuminate/encryption": "^11.35|^12.0", "illuminate/encryption": "^9.21|^10.0|^11.0|^12.0",
"illuminate/http": "^11.35|^12.0", "illuminate/http": "^9.21|^10.0|^11.0|^12.0",
"illuminate/support": "^11.35|^12.0", "illuminate/support": "^9.21|^10.0|^11.0|^12.0",
"league/oauth2-server": "^9.2", "lcobucci/jwt": "^4.3|^5.0",
"php": "^8.2", "league/oauth2-server": "^8.5.3",
"php-http/discovery": "^1.20", "nyholm/psr7": "^1.5",
"phpseclib/phpseclib": "^3.0", "php": "^8.0",
"psr/http-factory-implementation": "*", "phpseclib/phpseclib": "^2.0|^3.0",
"symfony/console": "^7.1", "symfony/console": "^6.0|^7.0",
"symfony/psr-http-message-bridge": "^7.1" "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "^1.6", "mockery/mockery": "^1.0",
"orchestra/testbench": "^9.9|^10.0", "orchestra/testbench": "^7.35|^8.14|^9.0|^10.0",
"phpstan/phpstan": "^2.0", "phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^11.5|^12.0" "phpunit/phpunit": "^9.3|^10.5|^11.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -2167,7 +2166,7 @@
"issues": "https://github.com/laravel/passport/issues", "issues": "https://github.com/laravel/passport/issues",
"source": "https://github.com/laravel/passport" "source": "https://github.com/laravel/passport"
}, },
"time": "2025-05-07T17:16:06+00:00" "time": "2025-02-12T16:11:33+00:00"
}, },
{ {
"name": "laravel/prompts", "name": "laravel/prompts",
@@ -2900,34 +2899,29 @@
}, },
{ {
"name": "league/event", "name": "league/event",
"version": "3.0.3", "version": "2.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/event.git", "url": "https://github.com/thephpleague/event.git",
"reference": "ec38ff7ea10cad7d99a79ac937fbcffb9334c210" "reference": "062ebb450efbe9a09bc2478e89b7c933875b0935"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/event/zipball/ec38ff7ea10cad7d99a79ac937fbcffb9334c210", "url": "https://api.github.com/repos/thephpleague/event/zipball/062ebb450efbe9a09bc2478e89b7c933875b0935",
"reference": "ec38ff7ea10cad7d99a79ac937fbcffb9334c210", "reference": "062ebb450efbe9a09bc2478e89b7c933875b0935",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.2.0", "php": ">=7.1.0"
"psr/event-dispatcher": "^1.0"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.16", "henrikbjorn/phpspec-code-coverage": "~1.0.1",
"phpstan/phpstan": "^0.12.45", "phpspec/phpspec": "^2.2"
"phpunit/phpunit": "^8.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0-dev" "dev-master": "2.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2953,9 +2947,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/event/issues", "issues": "https://github.com/thephpleague/event/issues",
"source": "https://github.com/thephpleague/event/tree/3.0.3" "source": "https://github.com/thephpleague/event/tree/2.3.0"
}, },
"time": "2024-09-04T16:06:53+00:00" "time": "2025-03-14T19:51:10+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
@@ -3217,46 +3211,38 @@
}, },
{ {
"name": "league/oauth2-server", "name": "league/oauth2-server",
"version": "9.2.0", "version": "8.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git", "url": "https://github.com/thephpleague/oauth2-server.git",
"reference": "00323013403e1a1e0f424affafca56c28b60c22c" "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/00323013403e1a1e0f424affafca56c28b60c22c", "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/cc8778350f905667e796b3c2364a9d3bd7a73518",
"reference": "00323013403e1a1e0f424affafca56c28b60c22c", "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"defuse/php-encryption": "^2.4", "defuse/php-encryption": "^2.3",
"ext-json": "*",
"ext-openssl": "*", "ext-openssl": "*",
"lcobucci/clock": "^2.3 || ^3.0", "lcobucci/clock": "^2.2 || ^3.0",
"lcobucci/jwt": "^5.0", "lcobucci/jwt": "^4.3 || ^5.0",
"league/event": "^3.0", "league/event": "^2.2",
"league/uri": "^7.0", "league/uri": "^6.7 || ^7.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "php": "^8.0",
"psr/http-message": "^2.0", "psr/http-message": "^1.0.1 || ^2.0"
"psr/http-server-middleware": "^1.0"
}, },
"replace": { "replace": {
"league/oauth2server": "*", "league/oauth2server": "*",
"lncd/oauth2": "*" "lncd/oauth2": "*"
}, },
"require-dev": { "require-dev": {
"laminas/laminas-diactoros": "^3.5", "laminas/laminas-diactoros": "^3.0.0",
"php-parallel-lint/php-parallel-lint": "^1.3.2", "phpstan/phpstan": "^0.12.57",
"phpstan/extension-installer": "^1.3.1", "phpstan/phpstan-phpunit": "^0.12.16",
"phpstan/phpstan": "^1.12", "phpunit/phpunit": "^9.6.6",
"phpstan/phpstan-deprecation-rules": "^1.1.4", "roave/security-advisories": "dev-master"
"phpstan/phpstan-phpunit": "^1.3.15",
"phpstan/phpstan-strict-rules": "^1.5.2",
"phpunit/phpunit": "^9.6.21",
"roave/security-advisories": "dev-master",
"slevomat/coding-standard": "^8.14.1",
"squizlabs/php_codesniffer": "^3.8"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -3301,7 +3287,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/oauth2-server/issues", "issues": "https://github.com/thephpleague/oauth2-server/issues",
"source": "https://github.com/thephpleague/oauth2-server/tree/9.2.0" "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.5"
}, },
"funding": [ "funding": [
{ {
@@ -3309,7 +3295,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-02-15T00:49:10+00:00" "time": "2024-12-20T23:06:10+00:00"
}, },
{ {
"name": "league/uri", "name": "league/uri",
@@ -5538,119 +5524,6 @@
}, },
"time": "2023-04-04T09:54:51+00:00" "time": "2023-04-04T09:54:51+00:00"
}, },
{
"name": "psr/http-server-handler",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-server-handler.git",
"reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
"reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
"shasum": ""
},
"require": {
"php": ">=7.0",
"psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Server\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP server-side request handler",
"keywords": [
"handler",
"http",
"http-interop",
"psr",
"psr-15",
"psr-7",
"request",
"response",
"server"
],
"support": {
"source": "https://github.com/php-fig/http-server-handler/tree/1.0.2"
},
"time": "2023-04-10T20:06:20+00:00"
},
{
"name": "psr/http-server-middleware",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-server-middleware.git",
"reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
"reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
"shasum": ""
},
"require": {
"php": ">=7.0",
"psr/http-message": "^1.0 || ^2.0",
"psr/http-server-handler": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Server\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP server-side middleware",
"keywords": [
"http",
"http-interop",
"middleware",
"psr",
"psr-15",
"psr-7",
"request",
"response"
],
"support": {
"issues": "https://github.com/php-fig/http-server-middleware/issues",
"source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2"
},
"time": "2023-04-11T06:14:47+00:00"
},
{ {
"name": "psr/log", "name": "psr/log",
"version": "3.0.2", "version": "3.0.2",
@@ -9485,16 +9358,16 @@
}, },
{ {
"name": "thecodingmachine/safe", "name": "thecodingmachine/safe",
"version": "3.3.0", "version": "v3.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thecodingmachine/safe.git", "url": "https://github.com/thecodingmachine/safe.git",
"reference": "51a45c524c0f074493565a9deaa39025f19b2b24" "reference": "2cdd579eeaa2e78e51c7509b50cc9fb89a956236"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thecodingmachine/safe/zipball/51a45c524c0f074493565a9deaa39025f19b2b24", "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/2cdd579eeaa2e78e51c7509b50cc9fb89a956236",
"reference": "51a45c524c0f074493565a9deaa39025f19b2b24", "reference": "2cdd579eeaa2e78e51c7509b50cc9fb89a956236",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -9604,7 +9477,7 @@
"description": "PHP core functions that throw exceptions instead of returning FALSE on error", "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
"support": { "support": {
"issues": "https://github.com/thecodingmachine/safe/issues", "issues": "https://github.com/thecodingmachine/safe/issues",
"source": "https://github.com/thecodingmachine/safe/tree/3.3.0" "source": "https://github.com/thecodingmachine/safe/tree/v3.3.0"
}, },
"funding": [ "funding": [
{ {
@@ -9620,7 +9493,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-05-13T20:06:28+00:00" "time": "2025-05-14T06:15:44+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@@ -11163,16 +11036,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "2.1.14", "version": "2.1.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2" "reference": "402d11c1aa40ae2e1c3a512e6a4edb957527b20b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/402d11c1aa40ae2e1c3a512e6a4edb957527b20b",
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2", "reference": "402d11c1aa40ae2e1c3a512e6a4edb957527b20b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -11217,25 +11090,25 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-05-02T15:32:28+00:00" "time": "2025-05-14T11:16:08+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
"version": "2.0.2", "version": "2.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-deprecation-rules.git", "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
"reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf" "reference": "468e02c9176891cc901143da118f09dc9505fc2f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/9d8e7d4e32711715ad78a1fb6ec368df9af01fdf", "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/468e02c9176891cc901143da118f09dc9505fc2f",
"reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf", "reference": "468e02c9176891cc901143da118f09dc9505fc2f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
"phpstan/phpstan": "^2.1.13" "phpstan/phpstan": "^2.1.15"
}, },
"require-dev": { "require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.2", "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -11262,9 +11135,9 @@
"description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
"source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.2" "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.3"
}, },
"time": "2025-04-26T19:59:57+00:00" "time": "2025-05-14T10:56:57+00:00"
}, },
{ {
"name": "phpstan/phpstan-strict-rules", "name": "phpstan/phpstan-strict-rules",

6
package-lock.json generated
View File

@@ -3108,9 +3108,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "22.15.17", "version": "22.15.18",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.18.tgz",
"integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==", "integrity": "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {