From fe1c605c11833d07a918c740311a1eb668dd8316 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 19 Apr 2023 06:38:09 +0200 Subject: [PATCH 1/7] Update lock.yml Wonder if this works. Signed-off-by: James Cole --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index bb1e4a4455..88efb8d747 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v4 + - uses: JC5/lock-threads@v1 with: github-token: ${{ github.token }} issue-inactive-days: 90 From acfc214eb14df514607f4ef57c0a871d0bbbb751 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 19 Apr 2023 06:42:00 +0200 Subject: [PATCH 2/7] Update lock.yml Signed-off-by: James Cole --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 88efb8d747..abe7f721dc 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: JC5/lock-threads@v1 + - uses: JC5/lock-threads@main with: github-token: ${{ github.token }} issue-inactive-days: 90 From 3c1f4b737737001fe5bd1896e25ed998cbcf03c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 19 Apr 2023 06:43:19 +0200 Subject: [PATCH 3/7] Update lock.yml Signed-off-by: James Cole --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index abe7f721dc..9f58d86696 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -22,7 +22,7 @@ jobs: 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. + - 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. From efe17f638ae255dea46416a53a68120520abeac6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 19 Apr 2023 06:43:31 +0200 Subject: [PATCH 4/7] Update lock.yml Signed-off-by: James Cole --- .github/workflows/lock.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 9f58d86696..6480150462 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -23,6 +23,7 @@ jobs: 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. From 6b5ff2680b6ab3caeb734136489d93f51ecf8e7a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 19 Apr 2023 10:12:51 +0200 Subject: [PATCH 5/7] Update lock.yml Signed-off-by: James Cole --- .github/workflows/lock.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 6480150462..f01515c30d 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -17,13 +17,3 @@ jobs: github-token: ${{ github.token }} issue-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. From 1bddd4da8e0c7bd37ffd60fcd69673cd1bf55004 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 21:07:24 +0000 Subject: [PATCH 6/7] Bump guzzlehttp/psr7 from 2.4.4 to 2.5.0 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 2.4.4 to 2.5.0. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/2.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/2.4.4...2.5.0) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 1df45916bf..fd05517189 100644 --- a/composer.lock +++ b/composer.lock @@ -1586,22 +1586,22 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -1621,9 +1621,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -1685,7 +1682,7 @@ ], "support": { "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": [ { @@ -1701,7 +1698,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "guzzlehttp/uri-template", From 1e8d294b8d5c4027f3a0468c4ed50b70562f5f3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 20:52:03 +0000 Subject: [PATCH 7/7] Bump nyholm/psr7 from 1.6.0 to 1.7.0 Bumps [nyholm/psr7](https://github.com/Nyholm/psr7) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/Nyholm/psr7/releases) - [Changelog](https://github.com/Nyholm/psr7/blob/master/CHANGELOG.md) - [Commits](https://github.com/Nyholm/psr7/compare/1.6.0...1.7.0) --- updated-dependencies: - dependency-name: nyholm/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index fd05517189..a8a9f8edc1 100644 --- a/composer.lock +++ b/composer.lock @@ -4068,23 +4068,23 @@ }, { "name": "nyholm/psr7", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/Nyholm/psr7.git", - "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50" + "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/psr7/zipball/bf4aebd170fadf5fd808c70b90535de327e81a50", - "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/ed7cf98f6562831dbc3c962406b5e49dc8179c8c", + "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c", "shasum": "" }, "require": { - "php": ">=7.1", + "php": ">=7.2", "php-http/message-factory": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.1 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0", @@ -4093,14 +4093,14 @@ }, "require-dev": { "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", "symfony/error-handler": "^4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -4130,7 +4130,7 @@ ], "support": { "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": [ { @@ -4142,7 +4142,7 @@ "type": "github" } ], - "time": "2023-04-09T08:34:27+00:00" + "time": "2023-04-20T08:38:48+00:00" }, { "name": "paragonie/constant_time_encoding",