Skip to content

Commit

Permalink
Merge branch '2.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Seldaek committed Feb 25, 2022
2 parents b85e0ee + fa9a877 commit af995c3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
11 changes: 11 additions & 0 deletions 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)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/Composer/DependencyResolver/PoolOptimizer.php
Expand Up @@ -339,6 +339,11 @@ private function markPackageForRemoval(int $id): void
*/
private function keepPackage(BasePackage $package, array $identicalDefinitionsPerPackage, array $packageIdenticalDefinitionLookup): void
{
// Already marked to keep
if (!isset($this->packagesToRemove[$package->id])) {
return;
}

unset($this->packagesToRemove[$package->id]);

if ($package instanceof AliasPackage) {
Expand Down

0 comments on commit af995c3

Please sign in to comment.