From 80218f207dd6c9c23bc14da4673cadaaa3dc5d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 13 Dec 2022 18:55:09 +0100 Subject: [PATCH 1/3] Update branch metadata --- .doctrine-project.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index 05348903..303b9ac1 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -5,21 +5,27 @@ "docsSlug": "doctrine-coding-standard", "versions": [ { - "name": "11.0", - "branchName": "11.0.x", - "slug": "11.0", + "name": "12.0", + "branchName": "12.0.x", + "slug": "12.0", "upcoming": true }, { - "name": "10.0", - "branchName": "10.0.x", - "slug": "10.0", + "name": "11.0", + "branchName": "11.0.x", + "slug": "11.0", "current": true, "aliases": [ "current", "stable" ] }, + { + "name": "10.0", + "branchName": "10.0.x", + "slug": "10.0", + "maintained": false + }, { "name": "9.0", "branchName": "9.0.x", From 42e9bf31a50811774f3d58f8943579a7634e75dc Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 5 Jan 2023 14:26:00 +0100 Subject: [PATCH 2/3] GH Actions: update ubuntu images used See: https://github.com/actions/runner-images/issues/6002 --- .github/workflows/continuous-integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 462158f9..3d8c624e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -14,7 +14,7 @@ jobs: coding-standards: name: "Coding Standards" - runs-on: "ubuntu-18.04" + runs-on: "ubuntu-22.04" strategy: matrix: @@ -47,7 +47,7 @@ jobs: validate-against-schema: name: "Validate against schema" - runs-on: "ubuntu-18.04" + runs-on: "ubuntu-22.04" strategy: matrix: @@ -85,7 +85,7 @@ jobs: test-report: name: "Test report" - runs-on: "ubuntu-18.04" + runs-on: "ubuntu-22.04" strategy: fail-fast: false @@ -123,7 +123,7 @@ jobs: test-fixes: name: "Test fixes" - runs-on: "ubuntu-18.04" + runs-on: "ubuntu-22.04" strategy: fail-fast: false From 320ecf4b6bc0035cf5cae88251e55e2a61d814e8 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 5 Jan 2023 14:16:10 +0100 Subject: [PATCH 3/3] Composer: allow for the 1.0.0 version of the Composer PHPCS plugin The Composer PHPCS plugin has released its 1.0.0 version. :tada: Important: I've _widened_ the version constraints for the plugin, instead of _bumping_ it. The reason for this is to prevent conflicts with end-user projects/other external PHPCS standards which may also require(-dev) the plugin, but may not (yet) have updated _their_ constraints for the plugin. If the version would have been bumped instead of widened, those users would get an unsolvable conflict during the `composer install` run (unless they `require-dev` the plugin for the root project, but then, that's exactly what we _don't_ want them to do as external standards managing the versions of the plugins should be more reliable). Ref: https://github.com/PHPCSStandards/composer-installer/releases/tag/v1.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 59f11989..e0082438 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ ], "require": { "php": "^7.2 || ^8.0", - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0.0", "slevomat/coding-standard": "^8.6.2", "squizlabs/php_codesniffer": "^3.7" },