IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Api/V1/Controllers/Chart/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/BillController.php
#	app/Api/V1/Controllers/Insight/Expense/BudgetController.php
#	app/Api/V1/Controllers/Insight/Expense/CategoryController.php
#	app/Api/V1/Controllers/Insight/Expense/PeriodController.php
#	app/Console/Commands/Upgrade/MigrateToGroups.php
#	app/Http/Controllers/Account/IndexController.php
#	app/Http/Controllers/Budget/AvailableBudgetController.php
#	app/Http/Controllers/Budget/BudgetLimitController.php
#	app/Http/Controllers/Budget/EditController.php
#	app/Http/Controllers/Chart/AccountController.php
#	app/Http/Controllers/Json/FrontpageController.php
#	app/Http/Controllers/PiggyBank/EditController.php
This commit is contained in:
James Cole
2022-12-24 06:15:26 +01:00
parent 33f764088e 63184ac298
commit db478711ed
47 changed files with 428 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
composer.lock generated
View File

@@ -470,16 +470,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.5.1",
"version": "3.5.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"
"reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
"reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/63e513cebbbaf96a6795e5c5ee34d205831bfc85",
"reference": "63e513cebbbaf96a6795e5c5ee34d205831bfc85",
"shasum": ""
},
"require": {
@@ -492,16 +492,16 @@
"psr/log": "^1|^2|^3"
},
"require-dev": {
"doctrine/coding-standard": "10.0.0",
"jetbrains/phpstorm-stubs": "2022.2",
"phpstan/phpstan": "1.8.10",
"doctrine/coding-standard": "11.0.0",
"jetbrains/phpstorm-stubs": "2022.3",
"phpstan/phpstan": "1.9.2",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "9.5.25",
"psalm/plugin-phpunit": "0.17.0",
"phpunit/phpunit": "9.5.27",
"psalm/plugin-phpunit": "0.18.4",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0",
"vimeo/psalm": "4.29.0"
"vimeo/psalm": "4.30.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -561,7 +561,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.5.1"
"source": "https://github.com/doctrine/dbal/tree/3.5.2"
},
"funding": [
{
@@ -577,7 +577,7 @@
"type": "tidelift"
}
],
"time": "2022-10-24T07:26:18+00:00"
"time": "2022-12-19T08:17:34+00:00"
},
{
"name": "doctrine/deprecations",
@@ -1135,16 +1135,16 @@
},
{
"name": "firebase/php-jwt",
"version": "v6.3.1",
"version": "v6.3.2",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
"reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da"
"reference": "ea7dda77098b96e666c5ef382452f94841e439cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/ddfaddcb520488b42bca3a75e17e9dd53c3667da",
"reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/ea7dda77098b96e666c5ef382452f94841e439cd",
"reference": "ea7dda77098b96e666c5ef382452f94841e439cd",
"shasum": ""
},
"require": {
@@ -1191,9 +1191,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.3.1"
"source": "https://github.com/firebase/php-jwt/tree/v6.3.2"
},
"time": "2022-11-01T21:20:08+00:00"
"time": "2022-12-19T17:10:46+00:00"
},
{
"name": "fruitcake/php-cors",
@@ -1855,16 +1855,16 @@
},
{
"name": "laravel/framework",
"version": "v9.43.0",
"version": "v9.45.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "011f2e1d49a11c22519a7899b46ddf3bc5b0f40b"
"reference": "faeb20d3fc61b69790068161ab42bcf2d5faccbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/011f2e1d49a11c22519a7899b46ddf3bc5b0f40b",
"reference": "011f2e1d49a11c22519a7899b46ddf3bc5b0f40b",
"url": "https://api.github.com/repos/laravel/framework/zipball/faeb20d3fc61b69790068161ab42bcf2d5faccbc",
"reference": "faeb20d3fc61b69790068161ab42bcf2d5faccbc",
"shasum": ""
},
"require": {
@@ -1875,7 +1875,7 @@
"ext-openssl": "*",
"fruitcake/php-cors": "^1.2",
"laravel/serializable-closure": "^1.2.2",
"league/commonmark": "^2.2",
"league/commonmark": "^2.2.1",
"league/flysystem": "^3.8.0",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.62.1",
@@ -1884,7 +1884,7 @@
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
"psr/simple-cache": "^1.0|^2.0|^3.0",
"ramsey/uuid": "^4.2.2",
"ramsey/uuid": "^4.7",
"symfony/console": "^6.0.9",
"symfony/error-handler": "^6.0",
"symfony/finder": "^6.0",
@@ -1945,7 +1945,7 @@
"ably/ably-php": "^1.0",
"aws/aws-sdk-php": "^3.235.5",
"doctrine/dbal": "^2.13.3|^3.1.4",
"fakerphp/faker": "^1.9.2",
"fakerphp/faker": "^1.21",
"guzzlehttp/guzzle": "^7.5",
"league/flysystem-aws-s3-v3": "^3.0",
"league/flysystem-ftp": "^3.0",
@@ -1953,7 +1953,7 @@
"league/flysystem-read-only": "^3.3",
"league/flysystem-sftp-v3": "^3.0",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^7.11",
"orchestra/testbench-core": "^7.16",
"pda/pheanstalk": "^4.0",
"phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^9.5.8",
@@ -2037,7 +2037,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-12-06T14:26:07+00:00"
"time": "2022-12-21T19:37:46+00:00"
},
{
"name": "laravel/passport",
@@ -2678,16 +2678,16 @@
},
{
"name": "league/config",
"version": "v1.1.1",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/config.git",
"reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"
"reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
"reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
"url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
"reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
"shasum": ""
},
"require": {
@@ -2696,7 +2696,7 @@
"php": "^7.4 || ^8.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.90",
"phpstan/phpstan": "^1.8.2",
"phpunit/phpunit": "^9.5.5",
"scrutinizer/ocular": "^1.8.1",
"unleashedtech/php-coding-standard": "^3.1",
@@ -2756,7 +2756,7 @@
"type": "github"
}
],
"time": "2021-08-14T12:15:32+00:00"
"time": "2022-12-11T20:36:23+00:00"
},
{
"name": "league/csv",
@@ -2898,16 +2898,16 @@
},
{
"name": "league/flysystem",
"version": "3.11.0",
"version": "3.12.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "7e423e5dd240a60adfab9bde058d7668863b7731"
"reference": "2aef65a47e44f2d6f9938f720f6dd697e7ba7b76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7e423e5dd240a60adfab9bde058d7668863b7731",
"reference": "7e423e5dd240a60adfab9bde058d7668863b7731",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2aef65a47e44f2d6f9938f720f6dd697e7ba7b76",
"reference": "2aef65a47e44f2d6f9938f720f6dd697e7ba7b76",
"shasum": ""
},
"require": {
@@ -2969,7 +2969,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.11.0"
"source": "https://github.com/thephpleague/flysystem/tree/3.12.0"
},
"funding": [
{
@@ -2985,7 +2985,7 @@
"type": "tidelift"
}
],
"time": "2022-12-02T14:39:57+00:00"
"time": "2022-12-20T20:21:10+00:00"
},
{
"name": "league/fractal",
@@ -3725,16 +3725,16 @@
},
{
"name": "nunomaduro/collision",
"version": "v6.3.1",
"version": "v6.3.2",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b"
"reference": "83699b231e7f277bfa2e823788973bf4082f019a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/0f6349c3ed5dd28467087b08fb59384bb458a22b",
"reference": "0f6349c3ed5dd28467087b08fb59384bb458a22b",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/83699b231e7f277bfa2e823788973bf4082f019a",
"reference": "83699b231e7f277bfa2e823788973bf4082f019a",
"shasum": ""
},
"require": {
@@ -3809,20 +3809,20 @@
"type": "patreon"
}
],
"time": "2022-09-29T12:29:49+00:00"
"time": "2022-12-23T21:36:49+00:00"
},
{
"name": "nunomaduro/termwind",
"version": "v1.14.2",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/termwind.git",
"reference": "9a8218511eb1a0965629ff820dda25985440aefc"
"reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/termwind/zipball/9a8218511eb1a0965629ff820dda25985440aefc",
"reference": "9a8218511eb1a0965629ff820dda25985440aefc",
"url": "https://api.github.com/repos/nunomaduro/termwind/zipball/594ab862396c16ead000de0c3c38f4a5cbe1938d",
"reference": "594ab862396c16ead000de0c3c38f4a5cbe1938d",
"shasum": ""
},
"require": {
@@ -3879,7 +3879,7 @@
],
"support": {
"issues": "https://github.com/nunomaduro/termwind/issues",
"source": "https://github.com/nunomaduro/termwind/tree/v1.14.2"
"source": "https://github.com/nunomaduro/termwind/tree/v1.15.0"
},
"funding": [
{
@@ -3895,7 +3895,7 @@
"type": "github"
}
],
"time": "2022-10-28T22:51:32+00:00"
"time": "2022-12-20T19:00:15+00:00"
},
{
"name": "nyholm/psr7",
@@ -4222,16 +4222,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.17",
"version": "3.0.18",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761"
"reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da",
"reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da",
"shasum": ""
},
"require": {
@@ -4312,7 +4312,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.17"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.18"
},
"funding": [
{
@@ -4328,7 +4328,7 @@
"type": "tidelift"
}
],
"time": "2022-10-24T10:51:50+00:00"
"time": "2022-12-17T18:26:50+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -5168,23 +5168,23 @@
},
{
"name": "ramsey/uuid",
"version": "4.6.0",
"version": "4.7.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "ad63bc700e7d021039e30ce464eba384c4a1d40f"
"reference": "5ed9ad582647bbc3864ef78db34bdc1afdcf9b49"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/ad63bc700e7d021039e30ce464eba384c4a1d40f",
"reference": "ad63bc700e7d021039e30ce464eba384c4a1d40f",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/5ed9ad582647bbc3864ef78db34bdc1afdcf9b49",
"reference": "5ed9ad582647bbc3864ef78db34bdc1afdcf9b49",
"shasum": ""
},
"require": {
"brick/math": "^0.8.8 || ^0.9 || ^0.10",
"ext-json": "*",
"php": "^8.0",
"ramsey/collection": "^1.0"
"ramsey/collection": "^1.2"
},
"replace": {
"rhumsaa/uuid": "self.version"
@@ -5244,7 +5244,7 @@
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
"source": "https://github.com/ramsey/uuid/tree/4.6.0"
"source": "https://github.com/ramsey/uuid/tree/4.7.0"
},
"funding": [
{
@@ -5256,7 +5256,7 @@
"type": "tidelift"
}
],
"time": "2022-11-05T23:03:38+00:00"
"time": "2022-12-19T22:30:49+00:00"
},
{
"name": "rcrowe/twigbridge",
@@ -9048,20 +9048,20 @@
},
{
"name": "fakerphp/faker",
"version": "v1.20.0",
"version": "v1.21.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "37f751c67a5372d4e26353bd9384bc03744ec77b"
"reference": "92efad6a967f0b79c499705c69b662f738cc9e4d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b",
"reference": "37f751c67a5372d4e26353bd9384bc03744ec77b",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d",
"reference": "92efad6a967f0b79c499705c69b662f738cc9e4d",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
"php": "^7.4 || ^8.0",
"psr/container": "^1.0 || ^2.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
},
@@ -9072,7 +9072,8 @@
"bamarni/composer-bin-plugin": "^1.4.1",
"doctrine/persistence": "^1.3 || ^2.0",
"ext-intl": "*",
"symfony/phpunit-bridge": "^4.4 || ^5.2"
"phpunit/phpunit": "^9.5.26",
"symfony/phpunit-bridge": "^5.4.16"
},
"suggest": {
"doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
@@ -9084,7 +9085,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "v1.20-dev"
"dev-main": "v1.21-dev"
}
},
"autoload": {
@@ -9109,9 +9110,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v1.20.0"
"source": "https://github.com/FakerPHP/Faker/tree/v1.21.0"
},
"time": "2022-07-20T13:12:54+00:00"
"time": "2022-12-13T13:54:32+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -9899,16 +9900,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.2.19",
"version": "9.2.22",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
"reference": "e4bf60d2220b4baaa0572986b5d69870226b06df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
"reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df",
"reference": "e4bf60d2220b4baaa0572986b5d69870226b06df",
"shasum": ""
},
"require": {
@@ -9964,7 +9965,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22"
},
"funding": [
{
@@ -9972,7 +9973,7 @@
"type": "github"
}
],
"time": "2022-11-18T07:47:47+00:00"
"time": "2022-12-18T16:40:55+00:00"
},
{
"name": "phpunit/php-file-iterator",