public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '2.2' into main

pull/10571/head
Jordi Boggiano 2022-02-25 11:13:14 +01:00
parent b85e0eebc1 fa9a877246
commit af995c3038
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -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 ### [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) * 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 * 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.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.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 [2.2.4]: https://github.com/composer/composer/compare/2.2.3...2.2.4

5
src/Composer/DependencyResolver/PoolOptimizer.php
View File

@ -339,6 +339,11 @@ class PoolOptimizer
*/ */
private function keepPackage(BasePackage $package, array $identicalDefinitionsPerPackage, array $packageIdenticalDefinitionLookup): 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]); unset($this->packagesToRemove[$package->id]);
if ($package instanceof AliasPackage) { if ($package instanceof AliasPackage) {