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

This commit is contained in:
James Cole 2021-07-18 14:50:51 +02:00
commit fb17da3f56
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 8 additions and 8 deletions

View File

@ -111,7 +111,7 @@
"fakerphp/faker": "1.*",
"mockery/mockery": "1.*",
"nunomaduro/larastan": "^0.7.0",
"phpstan/phpstan": "^0.12.91",
"phpstan/phpstan": "^0.12.92",
"phpstan/phpstan-deprecation-rules": "^0.12.5",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b97f5e86e240bb8b2226bbb172339787",
"content-hash": "ae73a4b75451aaa53e99986c12dc96af",
"packages": [
{
"name": "bacon/bacon-qr-code",
@ -8851,16 +8851,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.91",
"version": "0.12.92",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a"
"reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8226701cd228a0d63c2df995de7ab6070c69ac6a",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/64d4c5dc8ea96972bc18432d137a330239a5d2b2",
"reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2",
"shasum": ""
},
"require": {
@ -8891,7 +8891,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.91"
"source": "https://github.com/phpstan/phpstan/tree/0.12.92"
},
"funding": [
{
@ -8911,7 +8911,7 @@
"type": "tidelift"
}
],
"time": "2021-07-04T15:31:48+00:00"
"time": "2021-07-10T13:53:49+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",