kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7667 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.6.0

Browse Source
This commit is contained in:
James Cole
2023-06-19 07:07:15 +02:00
committed by GitHub
parent 25f8acb417 20eb2ebe58
commit 5ef646b810
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -96,7 +96,7 @@
"league/commonmark": "2.*", "league/commonmark": "2.*",
"league/csv": "^9.7", "league/csv": "^9.7",
"league/fractal": "0.*", "league/fractal": "0.*",
"nunomaduro/collision": "^7.1", "nunomaduro/collision": "^7.6",
"pragmarx/google2fa": "^8.0", "pragmarx/google2fa": "^8.0",
"predis/predis": "^2.1", "predis/predis": "^2.1",
"psr/log": "<4", "psr/log": "<4",

34
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": "4f792c06cb58d42c0cb6a8d027aefbf7", "content-hash": "6a3a6f3b8f7af7c34efe9e21f0bea5d8",
"packages": [ "packages": [
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@@ -3876,40 +3876,40 @@
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
"version": "v7.5.2", "version": "v7.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nunomaduro/collision.git", "url": "https://github.com/nunomaduro/collision.git",
"reference": "76b3cabda0aabda455fc3b9db6c3615f5a87c7ff" "reference": "87faf7bc1c42d7fef7c60ec5c143050ce2a6189a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/76b3cabda0aabda455fc3b9db6c3615f5a87c7ff", "url": "https://api.github.com/repos/nunomaduro/collision/zipball/87faf7bc1c42d7fef7c60ec5c143050ce2a6189a",
"reference": "76b3cabda0aabda455fc3b9db6c3615f5a87c7ff", "reference": "87faf7bc1c42d7fef7c60ec5c143050ce2a6189a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"filp/whoops": "^2.15.2", "filp/whoops": "^2.15.2",
"nunomaduro/termwind": "^1.15.1", "nunomaduro/termwind": "^1.15.1",
"php": "^8.1.0", "php": "^8.1.0",
"symfony/console": "^6.2.8" "symfony/console": "^6.3.0"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<10.1.2" "phpunit/phpunit": "<10.1.2"
}, },
"require-dev": { "require-dev": {
"brianium/paratest": "^7.1.3", "brianium/paratest": "^7.2.0",
"laravel/framework": "^10.8.0", "laravel/framework": "^10.13.5",
"laravel/pint": "^1.9.0", "laravel/pint": "^1.10.2",
"laravel/sail": "^1.21.4", "laravel/sail": "^1.22.0",
"laravel/sanctum": "^3.2.1", "laravel/sanctum": "^3.2.5",
"laravel/tinker": "^2.8.1", "laravel/tinker": "^2.8.1",
"nunomaduro/larastan": "^2.6.0", "nunomaduro/larastan": "^2.6.3",
"orchestra/testbench-core": "^8.5.0", "orchestra/testbench-core": "^8.5.7",
"pestphp/pest": "^2.5.2", "pestphp/pest": "^2",
"phpunit/phpunit": "^10.1.1", "phpunit/phpunit": "^10.2.2",
"sebastian/environment": "^6.0.1", "sebastian/environment": "^6.0.1",
"spatie/laravel-ignition": "^2.1.0" "spatie/laravel-ignition": "^2.1.3"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -3968,7 +3968,7 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2023-04-22T22:12:40+00:00" "time": "2023-06-15T10:51:08+00:00"
}, },
{ {
"name": "nunomaduro/termwind", "name": "nunomaduro/termwind",