From 97fce64193e5eb9b0e21f43fab9fb6e4b87b2563 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:50:37 +0100 Subject: [PATCH 1/4] Update deps --- composer.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index e628c1a23..dbb8caec9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3dfd8964a34240eba83383a25e2f1fb", + "content-hash": "37b20f6337efdb6d4d1b656ea9fd6485", "packages": [ { "name": "composer/ca-bundle", @@ -234,23 +234,24 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.5", + "version": "1.5.6", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "de30328a7af8680efdc03e396aad24befd513200" + "reference": "a30d487169d799745ca7280bc90fdfa693536901" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/de30328a7af8680efdc03e396aad24befd513200", - "reference": "de30328a7af8680efdc03e396aad24befd513200", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901", + "reference": "a30d487169d799745ca7280bc90fdfa693536901", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7" + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "extra": { @@ -293,7 +294,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.5" + "source": "https://github.com/composer/spdx-licenses/tree/1.5.6" }, "funding": [ { @@ -309,7 +310,7 @@ "type": "tidelift" } ], - "time": "2020-12-03T16:04:16+00:00" + "time": "2021-11-18T10:14:14+00:00" }, { "name": "composer/xdebug-handler", From 04b04a5d7d00ae9657906826330814c68ca01106 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:51:39 +0100 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46b2f0bf0..513bf0ddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### [2.1.14] 2021-11-30 + + * Fixed invalid release build + ### [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) @@ -1301,6 +1305,7 @@ * Initial release +[2.1.14]: https://github.com/composer/composer/compare/2.1.13...2.1.14 [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 From cd28fc05b0c9d3beaf58b57018725c4dc15a6446 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:51:43 +0100 Subject: [PATCH 3/4] Release 2.1.14 --- 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..3ac94af70 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.14'; + const BRANCH_ALIAS_VERSION = ''; + const RELEASE_DATE = '2021-11-30 10:51:43'; + const SOURCE_VERSION = ''; /** * Version number of the internal composer-runtime-api package From b3df470be642dbe7fbaf98ae2f7fb655fa7eead8 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 30 Nov 2021 10:51:43 +0100 Subject: [PATCH 4/4] 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 3ac94af70..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.14'; - const BRANCH_ALIAS_VERSION = ''; - const RELEASE_DATE = '2021-11-30 10:51:43'; - 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