Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2023-08-22 08:25:16 +02:00
commit 60809c688e
4 changed files with 69 additions and 63 deletions

View File

@ -111,7 +111,7 @@
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-ide-helper": "2.*", "barryvdh/laravel-ide-helper": "2.*",
"ergebnis/phpstan-rules": "^2.0", "ergebnis/phpstan-rules": "^2.1",
"fakerphp/faker": "1.*", "fakerphp/faker": "1.*",
"filp/whoops": "2.*", "filp/whoops": "2.*",
"mockery/mockery": "1.*", "mockery/mockery": "1.*",

120
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": "8c97249c2a4e91bce05b1c2caab82909", "content-hash": "f10badbb36f1c9d729bd2043bac4548c",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -473,16 +473,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.6.5", "version": "3.6.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "96d5a70fd91efdcec81fc46316efc5bf3da17ddf" "reference": "63646ffd71d1676d2f747f871be31b7e921c7864"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/96d5a70fd91efdcec81fc46316efc5bf3da17ddf", "url": "https://api.github.com/repos/doctrine/dbal/zipball/63646ffd71d1676d2f747f871be31b7e921c7864",
"reference": "96d5a70fd91efdcec81fc46316efc5bf3da17ddf", "reference": "63646ffd71d1676d2f747f871be31b7e921c7864",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -498,10 +498,11 @@
"doctrine/coding-standard": "12.0.0", "doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1", "jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.10.21", "phpstan/phpstan": "1.10.29",
"phpstan/phpstan-strict-rules": "^1.5", "phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.6.9", "phpunit/phpunit": "9.6.9",
"psalm/plugin-phpunit": "0.18.4", "psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.7.2", "squizlabs/php_codesniffer": "3.7.2",
"symfony/cache": "^5.4|^6.0", "symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0",
@ -565,7 +566,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.6.5" "source": "https://github.com/doctrine/dbal/tree/3.6.6"
}, },
"funding": [ "funding": [
{ {
@ -581,7 +582,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-07-17T09:15:50+00:00" "time": "2023-08-17T05:38:17+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -1942,16 +1943,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v10.18.0", "version": "v10.19.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "9d41928900f7ecf409627a7d06c0a4dfecff2ea7" "reference": "b8557e4a708a1bd2bc8229bd53feecfa2ac1c6fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/9d41928900f7ecf409627a7d06c0a4dfecff2ea7", "url": "https://api.github.com/repos/laravel/framework/zipball/b8557e4a708a1bd2bc8229bd53feecfa2ac1c6fb",
"reference": "9d41928900f7ecf409627a7d06c0a4dfecff2ea7", "reference": "b8557e4a708a1bd2bc8229bd53feecfa2ac1c6fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2138,7 +2139,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2023-08-08T14:30:38+00:00" "time": "2023-08-15T13:42:57+00:00"
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
@ -2220,16 +2221,16 @@
}, },
{ {
"name": "laravel/prompts", "name": "laravel/prompts",
"version": "v0.1.4", "version": "v0.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/prompts.git", "url": "https://github.com/laravel/prompts.git",
"reference": "1b3ab520a75eddefcda99f49fb551d231769b1fa" "reference": "d880a909df144a4bf5760ebd09aba114f79d9adc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/prompts/zipball/1b3ab520a75eddefcda99f49fb551d231769b1fa", "url": "https://api.github.com/repos/laravel/prompts/zipball/d880a909df144a4bf5760ebd09aba114f79d9adc",
"reference": "1b3ab520a75eddefcda99f49fb551d231769b1fa", "reference": "d880a909df144a4bf5760ebd09aba114f79d9adc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2262,9 +2263,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/laravel/prompts/issues", "issues": "https://github.com/laravel/prompts/issues",
"source": "https://github.com/laravel/prompts/tree/v0.1.4" "source": "https://github.com/laravel/prompts/tree/v0.1.5"
}, },
"time": "2023-08-07T13:14:59+00:00" "time": "2023-08-15T14:29:44+00:00"
}, },
{ {
"name": "laravel/sanctum", "name": "laravel/sanctum",
@ -3678,25 +3679,29 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.68.1", "version": "2.69.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da" "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c",
"reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da", "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"php": "^7.1.8 || ^8.0", "php": "^7.1.8 || ^8.0",
"psr/clock": "^1.0",
"symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-mbstring": "^1.0",
"symfony/polyfill-php80": "^1.16", "symfony/polyfill-php80": "^1.16",
"symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
}, },
"provide": {
"psr/clock-implementation": "1.0"
},
"require-dev": { "require-dev": {
"doctrine/dbal": "^2.0 || ^3.1.4", "doctrine/dbal": "^2.0 || ^3.1.4",
"doctrine/orm": "^2.7", "doctrine/orm": "^2.7",
@ -3776,7 +3781,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-20T18:29:04+00:00" "time": "2023-08-03T09:00:52+00:00"
}, },
{ {
"name": "nette/schema", "name": "nette/schema",
@ -4669,16 +4674,16 @@
}, },
{ {
"name": "predis/predis", "name": "predis/predis",
"version": "v2.2.0", "version": "v2.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/predis/predis.git", "url": "https://github.com/predis/predis.git",
"reference": "33b70b971a32b0d28b4f748b0547593dce316e0d" "reference": "5f2b410a74afaff296a87a494e4c5488cf9fab57"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/predis/predis/zipball/33b70b971a32b0d28b4f748b0547593dce316e0d", "url": "https://api.github.com/repos/predis/predis/zipball/5f2b410a74afaff296a87a494e4c5488cf9fab57",
"reference": "33b70b971a32b0d28b4f748b0547593dce316e0d", "reference": "5f2b410a74afaff296a87a494e4c5488cf9fab57",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4718,7 +4723,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/predis/predis/issues", "issues": "https://github.com/predis/predis/issues",
"source": "https://github.com/predis/predis/tree/v2.2.0" "source": "https://github.com/predis/predis/tree/v2.2.1"
}, },
"funding": [ "funding": [
{ {
@ -4726,7 +4731,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-06-14T10:37:31+00:00" "time": "2023-08-15T23:01:46+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@ -9201,38 +9206,39 @@
}, },
{ {
"name": "ergebnis/phpstan-rules", "name": "ergebnis/phpstan-rules",
"version": "2.0.0", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ergebnis/phpstan-rules.git", "url": "https://github.com/ergebnis/phpstan-rules.git",
"reference": "99360283faf07a6d553f384183f3551a054c5aeb" "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/99360283faf07a6d553f384183f3551a054c5aeb", "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/119e229c48688946450ccca9f1c57c9ca4fb6f02",
"reference": "99360283faf07a6d553f384183f3551a054c5aeb", "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-mbstring": "*", "ext-mbstring": "*",
"nikic/php-parser": "^4.2.3", "nikic/php-parser": "^4.2.3",
"php": "~8.0.0 || ~8.1.0 || ~8.2.0", "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"phpstan/phpstan": "^1.7.15" "phpstan/phpstan": "^1.10.21"
}, },
"require-dev": { "require-dev": {
"doctrine/orm": "^2.14.3", "doctrine/orm": "^2.16.1",
"ergebnis/composer-normalize": "^2.30.2", "ergebnis/composer-normalize": "^2.35.0",
"ergebnis/license": "^2.1.0", "ergebnis/license": "^2.1.0",
"ergebnis/php-cs-fixer-config": "^5.5.2", "ergebnis/php-cs-fixer-config": "^5.13.0",
"infection/infection": "~0.26.19", "ergebnis/phpunit-slow-test-detector": "^2.3.0",
"nette/di": "^3.1.2", "infection/infection": "~0.27.0",
"phpstan/phpstan-deprecation-rules": "^1.0.0", "nette/di": "^3.1.3",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/phpstan-strict-rules": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.1.0",
"phpunit/phpunit": "^9.6.7", "phpunit/phpunit": "^10.3.2",
"psalm/plugin-phpunit": "~0.18.4", "psalm/plugin-phpunit": "~0.18.4",
"psr/container": "^1.1.2", "psr/container": "^1.1.2",
"rector/rector": "~0.15.25", "rector/rector": "~0.17.13",
"vimeo/psalm": "^5.9.0" "vimeo/psalm": "^5.14.1"
}, },
"type": "phpstan-extension", "type": "phpstan-extension",
"extra": { "extra": {
@ -9268,7 +9274,7 @@
"issues": "https://github.com/ergebnis/phpstan-rules/issues", "issues": "https://github.com/ergebnis/phpstan-rules/issues",
"source": "https://github.com/ergebnis/phpstan-rules" "source": "https://github.com/ergebnis/phpstan-rules"
}, },
"time": "2023-05-01T17:59:46+00:00" "time": "2023-08-17T10:28:37+00:00"
}, },
{ {
"name": "fakerphp/faker", "name": "fakerphp/faker",
@ -9535,16 +9541,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.16.0", "version": "v4.17.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "19526a33fb561ef417e822e85f08a00db4059c17" "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"reference": "19526a33fb561ef417e822e85f08a00db4059c17", "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9585,9 +9591,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
}, },
"time": "2023-06-25T14:52:30+00:00" "time": "2023-08-13T19:53:39+00:00"
}, },
{ {
"name": "nunomaduro/larastan", "name": "nunomaduro/larastan",
@ -10043,16 +10049,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.28", "version": "1.10.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "e4545b55904ebef470423d3ddddb74fa7325497a" "reference": "ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4545b55904ebef470423d3ddddb74fa7325497a", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1",
"reference": "e4545b55904ebef470423d3ddddb74fa7325497a", "reference": "ee5d8f2d3977fb09e55603eee6fb53bdd76ee9c1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10101,7 +10107,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-08-08T12:33:42+00:00" "time": "2023-08-14T13:24:11+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

8
package-lock.json generated
View File

@ -19,7 +19,7 @@
"devDependencies": { "devDependencies": {
"axios": "^1.1.2", "axios": "^1.1.2",
"laravel-vite-plugin": "^0.8.0", "laravel-vite-plugin": "^0.8.0",
"sass": "^1.64.2", "sass": "^1.66.1",
"vite": "^4.0.0", "vite": "^4.0.0",
"vite-plugin-manifest-sri": "^0.1.0" "vite-plugin-manifest-sri": "^0.1.0"
} }
@ -920,9 +920,9 @@
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.65.1", "version": "1.66.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
"integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==", "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",

View File

@ -8,7 +8,7 @@
"devDependencies": { "devDependencies": {
"axios": "^1.1.2", "axios": "^1.1.2",
"laravel-vite-plugin": "^0.8.0", "laravel-vite-plugin": "^0.8.0",
"sass": "^1.64.2", "sass": "^1.66.1",
"vite": "^4.0.0", "vite": "^4.0.0",
"vite-plugin-manifest-sri": "^0.1.0" "vite-plugin-manifest-sri": "^0.1.0"
}, },