From ad04e315eba9788de8d5827b4290c04af2be7780 Mon Sep 17 00:00:00 2001 From: Marcel Kuhmann Date: Wed, 14 Feb 2024 22:23:51 +0100 Subject: [PATCH 1/4] update phpdocumentor to 3.4.3 (#47) --- composer.json | 5 ++++- composer.lock | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index d93de5baa..a29b5fe29 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { "config": { "platform": { - "php": "7.4" + "php": "8.1" + }, + "allow-plugins": { + "phpdocumentor/shim": true } }, "require": { diff --git a/composer.lock b/composer.lock index 941733e8e..dd79d2886 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b88b3602a557ac54bd34d27f0e811a1a", + "content-hash": "be13e8c85a48772eb6c48081bdcd3401", "packages": [ { "name": "phar-io/composer-distributor", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/phar-io/composer-distributor.git", - "reference": "34af1d33bdce88b8f7217f7d53bf3d4ebd36ae60" + "reference": "dd7d936290b2a42b0c64bfe08090b5c597c280c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/composer-distributor/zipball/34af1d33bdce88b8f7217f7d53bf3d4ebd36ae60", - "reference": "34af1d33bdce88b8f7217f7d53bf3d4ebd36ae60", + "url": "https://api.github.com/repos/phar-io/composer-distributor/zipball/dd7d936290b2a42b0c64bfe08090b5c597c280c9", + "reference": "dd7d936290b2a42b0c64bfe08090b5c597c280c9", "shasum": "" }, "require": { @@ -71,7 +71,7 @@ ], "support": { "issues": "https://github.com/phar-io/composer-distributor/issues", - "source": "https://github.com/phar-io/composer-distributor/tree/1.0.1" + "source": "https://github.com/phar-io/composer-distributor/tree/1.0.2" }, "funding": [ { @@ -79,7 +79,7 @@ "type": "other" } ], - "time": "2021-04-21T12:34:19+00:00" + "time": "2023-05-31T17:05:49+00:00" }, { "name": "phar-io/executor", @@ -222,16 +222,16 @@ }, { "name": "phpdocumentor/shim", - "version": "v3.3.1", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/shim.git", - "reference": "65f8734d91b294555fcb2ca8808f87811e18abed" + "reference": "cda99f4be51464da4557f240b9bb98e85a9163fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/shim/zipball/65f8734d91b294555fcb2ca8808f87811e18abed", - "reference": "65f8734d91b294555fcb2ca8808f87811e18abed", + "url": "https://api.github.com/repos/phpDocumentor/shim/zipball/cda99f4be51464da4557f240b9bb98e85a9163fa", + "reference": "cda99f4be51464da4557f240b9bb98e85a9163fa", "shasum": "" }, "require": { @@ -252,9 +252,9 @@ "MIT" ], "support": { - "source": "https://github.com/phpDocumentor/shim/tree/v3.3.1" + "source": "https://github.com/phpDocumentor/shim/tree/v3.4.3" }, - "time": "2022-03-25T16:05:14+00:00" + "time": "2023-10-04T18:36:17+00:00" } ], "packages-dev": [], @@ -266,7 +266,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "7.4" + "php": "8.1" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } From bd28c80935733b34d55785ec689a787467f44146 Mon Sep 17 00:00:00 2001 From: Marcel Kuhmann Date: Wed, 14 Feb 2024 22:25:16 +0100 Subject: [PATCH 2/4] add kodiak config (#48) --- .github/.kodiak.toml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/.kodiak.toml diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml new file mode 100644 index 000000000..02d29b261 --- /dev/null +++ b/.github/.kodiak.toml @@ -0,0 +1,19 @@ +# .kodiak.toml +version = 1 + +[merge] +method = "squash" +delete_branch_on_merge = true +dont_wait_on_status_checks = ["WIP"] # handle github.com/apps/wip +# label to use to enable Kodiak to merge a PR +automerge_label = "automerge" # default: "automerge" +# require that the automerge label be set for Kodiak to merge a PR. if you +# disable this Kodiak will immediately attempt to merge every PR you create +require_automerge_label = true + +[merge.message] +title = "pull_request_title" +body = "empty" +include_coauthors = true +include_pr_number = true +strip_html_comments = true # remove html comments to auto remove PR templates From 292796fdfab1fff87e2d882dc62a49476f6e9b9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:30:04 +0000 Subject: [PATCH 3/4] Bump ramsey/composer-install from 1 to 2 (#46) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13f4e54f4..84d5b3a58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - - uses: "ramsey/composer-install@v1" + - uses: "ramsey/composer-install@v2" with: composer-options: "--ansi --prefer-dist" From 070390614adbc2e83113655aa61dcb390f8bbbd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:31:29 +0000 Subject: [PATCH 4/4] Bump actions/checkout from 2 to 4 (#45) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84d5b3a58..1e415af22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: install graphviz run: sudo apt-get install graphviz - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: "ramsey/composer-install@v2" with: