From 42c2108956e88c000b358610c983dcdab76aa97d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:31:00 +0100 Subject: [PATCH 1/5] Remove symfony/console ^6 compat as it is incorrect, fixes #10321 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a13c6b5d4..f61d0db24 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "psr/log": "^1.0 || ^2.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", - "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", From 965b12cdecc09a355d8ff8b0f8860c9d872b240f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:31:25 +0100 Subject: [PATCH 2/5] Allow alpha and above for latest deps build to catch dependency problems earlier next time --- .github/workflows/continuous-integration.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 21e583cc6..d723c435a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -90,6 +90,10 @@ jobs: - name: "Remove platform config to get latest dependencies for current PHP version when build is not locked" run: "composer config platform --unset" + - name: "Allow alpha releases for latest-deps builds to catch problems earlier" + if: "contains(matrix.dependencies, 'highest')" + run: "composer config minimum-stability alpha" + - name: "Update dependencies from composer.json using composer binary provided by system" if: "contains(matrix.dependencies, 'highest') || contains(matrix.dependencies, 'lowest')" run: "composer update ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}" From 0ec0f203322683dcd138aa5a4f9565e774a02f1e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:34:42 +0100 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae55a5967..46b2f0bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### [2.1.13] 2021-11-30 + + * Removed `symfony/console ^6` support as we cannot be compatible until Composer 2.3.0 is released. If you have issues with Composer required as a dependency + Symfony make sure you stay on Symfony 5.4 for now. (#10321) + ### [2.1.12] 2021-11-09 * Fixed issues in proxied binary files relying on __FILE__ / __DIR__ on php <8 (#10261) @@ -1297,6 +1301,7 @@ * Initial release +[2.1.13]: https://github.com/composer/composer/compare/2.1.12...2.1.13 [2.1.12]: https://github.com/composer/composer/compare/2.1.11...2.1.12 [2.1.11]: https://github.com/composer/composer/compare/2.1.10...2.1.11 [2.1.10]: https://github.com/composer/composer/compare/2.1.9...2.1.10 From 1b8338661e4e682bb18f992c3105f61b8c8f141f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:37:51 +0100 Subject: [PATCH 4/5] Release 2.1.13 --- src/Composer/Composer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php index f22a15a45..59797e292 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -51,10 +51,10 @@ class Composer * const RELEASE_DATE = '@release_date@'; * const SOURCE_VERSION = '1.8-dev+source'; */ - const VERSION = '@package_version@'; - const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; - const RELEASE_DATE = '@release_date@'; - const SOURCE_VERSION = '2.1.999-dev+source'; + const VERSION = '2.1.13'; + const BRANCH_ALIAS_VERSION = ''; + const RELEASE_DATE = '2021-11-30 10:37:51'; + const SOURCE_VERSION = ''; /** * Version number of the internal composer-runtime-api package From fdfad6ac66b911bf4b79eb6e653a288b3165dc7a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:39:12 +0100 Subject: [PATCH 5/5] Reverting release version changes --- src/Composer/Composer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php index 59797e292..f22a15a45 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -51,10 +51,10 @@ class Composer * const RELEASE_DATE = '@release_date@'; * const SOURCE_VERSION = '1.8-dev+source'; */ - const VERSION = '2.1.13'; - const BRANCH_ALIAS_VERSION = ''; - const RELEASE_DATE = '2021-11-30 10:37:51'; - const SOURCE_VERSION = ''; + const VERSION = '@package_version@'; + const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; + const RELEASE_DATE = '@release_date@'; + const SOURCE_VERSION = '2.1.999-dev+source'; /** * Version number of the internal composer-runtime-api package