From 8179d1ea337bca5bfcfd3e2b9b7d228861fa580c Mon Sep 17 00:00:00 2001 From: Yanick Witschi Date: Fri, 18 Feb 2022 17:39:19 +0100 Subject: [PATCH 1/4] Early return when a package was already marked to be kept --- src/Composer/DependencyResolver/PoolOptimizer.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Composer/DependencyResolver/PoolOptimizer.php b/src/Composer/DependencyResolver/PoolOptimizer.php index 841a2e9c6..ef17938b5 100644 --- a/src/Composer/DependencyResolver/PoolOptimizer.php +++ b/src/Composer/DependencyResolver/PoolOptimizer.php @@ -340,6 +340,11 @@ class PoolOptimizer */ private function keepPackage(BasePackage $package, $identicalDefinitionsPerPackage, $packageIdenticalDefinitionLookup) { + // Already marked to keep + if (!isset($this->packagesToRemove[$package->id])) { + return; + } + unset($this->packagesToRemove[$package->id]); if ($package instanceof AliasPackage) { From 039980a45d2a30d41fe795ab7358055823210fd0 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 25 Feb 2022 10:55:04 +0100 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1ac0e34..baf972ae2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### [2.2.7] 2022-02-25 + + * Allow installation together with composer/xdebug-handler ^3 (#10528) + * Fixed support for packages with no licenses in `licenses` command output (#10537) + * Fixed handling of `allow-plugins: false` which kept warning (#10530) + * Fixed enum parsing in classmap generation when the enum keyword is not lowercased (#10521) + * Fixed author parsing in `init` command requiring an email whereas the schema allows a name only (#10538) + * Fixed issues in `require` command when requiring packages which do not exist (but are provided by something else you require) (#10541) + * Performance improvement in pool optimization step (#10546) + ### [2.2.6] 2022-02-04 * BC Break: due to an oversight, the `COMPOSER_BIN_DIR` env var for binaries added in Composer 2.2.2 had to be renamed to `COMPOSER_RUNTIME_BIN_DIR` (#10512) @@ -1384,6 +1394,7 @@ * Initial release +[2.2.7]: https://github.com/composer/composer/compare/2.2.6...2.2.7 [2.2.6]: https://github.com/composer/composer/compare/2.2.5...2.2.6 [2.2.5]: https://github.com/composer/composer/compare/2.2.4...2.2.5 [2.2.4]: https://github.com/composer/composer/compare/2.2.3...2.2.4 From 061d154dfdde157cbf453c4695e6af21c0e93903 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 25 Feb 2022 11:12:27 +0100 Subject: [PATCH 3/4] Release 2.2.7 --- 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 624e02507..8dad0837c 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -52,10 +52,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.2.999-dev+source'; + const VERSION = '2.2.7'; + const BRANCH_ALIAS_VERSION = ''; + const RELEASE_DATE = '2022-02-25 11:12:27'; + const SOURCE_VERSION = ''; /** * Version number of the internal composer-runtime-api package From fa9a877246ab3d52959557e84230f80e0b600be3 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 25 Feb 2022 11:12:28 +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 8dad0837c..624e02507 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -52,10 +52,10 @@ class Composer * const RELEASE_DATE = '@release_date@'; * const SOURCE_VERSION = '1.8-dev+source'; */ - const VERSION = '2.2.7'; - const BRANCH_ALIAS_VERSION = ''; - const RELEASE_DATE = '2022-02-25 11:12:27'; - const SOURCE_VERSION = ''; + const VERSION = '@package_version@'; + const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; + const RELEASE_DATE = '@release_date@'; + const SOURCE_VERSION = '2.2.999-dev+source'; /** * Version number of the internal composer-runtime-api package