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

Merge branch 'main' into develop

Browse Source
This commit is contained in:
James Cole
2023-04-22 06:43:09 +02:00
parent 9b1319f970 d8c0192f54
commit 10e7be1729
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/lock.yml vendored
View File

@@ -12,17 +12,8 @@ jobs:
pull-requests: write pull-requests: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: dessant/lock-threads@v4 - uses: JC5/lock-threads@main
with: with:
github-token: ${{ github.token }} github-token: ${{ github.token }}
issue-inactive-days: 90 issue-inactive-days: 90
pr-inactive-days: 90 pr-inactive-days: 90
issue-comment: >
Hi there! This is an automatic reply. `Share and enjoy`
This issue is now `locked` :lock:.
- If you feel there is more to be said about this specific issue, please feel free to open a new issue. Please refer to this issue for clarity.
- Follow-up questions and comments can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
Thank you for your consideration.

37
composer.lock generated
View File

@@ -1585,22 +1585,22 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.4.4", "version": "2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2.5 || ^8.0", "php": "^7.2.5 || ^8.0",
"psr/http-factory": "^1.0", "psr/http-factory": "^1.0",
"psr/http-message": "^1.0", "psr/http-message": "^1.1 || ^2.0",
"ralouphie/getallheaders": "^3.0" "ralouphie/getallheaders": "^3.0"
}, },
"provide": { "provide": {
@@ -1620,9 +1620,6 @@
"bamarni-bin": { "bamarni-bin": {
"bin-links": true, "bin-links": true,
"forward-command": false "forward-command": false
},
"branch-alias": {
"dev-master": "2.4-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1684,7 +1681,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.4" "source": "https://github.com/guzzle/psr7/tree/2.5.0"
}, },
"funding": [ "funding": [
{ {
@@ -1700,7 +1697,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-03-09T13:19:02+00:00" "time": "2023-04-17T16:11:26+00:00"
}, },
{ {
"name": "guzzlehttp/uri-template", "name": "guzzlehttp/uri-template",
@@ -4070,23 +4067,23 @@
}, },
{ {
"name": "nyholm/psr7", "name": "nyholm/psr7",
"version": "1.6.0", "version": "1.7.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Nyholm/psr7.git", "url": "https://github.com/Nyholm/psr7.git",
"reference": "bf4aebd170fadf5fd808c70b90535de327e81a50" "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/bf4aebd170fadf5fd808c70b90535de327e81a50", "url": "https://api.github.com/repos/Nyholm/psr7/zipball/ed7cf98f6562831dbc3c962406b5e49dc8179c8c",
"reference": "bf4aebd170fadf5fd808c70b90535de327e81a50", "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1", "php": ">=7.2",
"php-http/message-factory": "^1.0", "php-http/message-factory": "^1.0",
"psr/http-factory": "^1.0", "psr/http-factory": "^1.0",
"psr/http-message": "^1.0" "psr/http-message": "^1.1 || ^2.0"
}, },
"provide": { "provide": {
"php-http/message-factory-implementation": "1.0", "php-http/message-factory-implementation": "1.0",
@@ -4095,14 +4092,14 @@
}, },
"require-dev": { "require-dev": {
"http-interop/http-factory-tests": "^0.9", "http-interop/http-factory-tests": "^0.9",
"php-http/psr7-integration-tests": "^1.0", "php-http/psr7-integration-tests": "^1.0@dev",
"phpunit/phpunit": "^7.5 || 8.5 || 9.4", "phpunit/phpunit": "^7.5 || 8.5 || 9.4",
"symfony/error-handler": "^4.4" "symfony/error-handler": "^4.4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6-dev" "dev-master": "1.7-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4132,7 +4129,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Nyholm/psr7/issues", "issues": "https://github.com/Nyholm/psr7/issues",
"source": "https://github.com/Nyholm/psr7/tree/1.6.0" "source": "https://github.com/Nyholm/psr7/tree/1.7.0"
}, },
"funding": [ "funding": [
{ {
@@ -4144,7 +4141,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-04-09T08:34:27+00:00" "time": "2023-04-20T08:38:48+00:00"
}, },
{ {
"name": "paragonie/constant_time_encoding", "name": "paragonie/constant_time_encoding",