Skip to content

Commit ae6dea6

Browse files
Merge branch '1.x' into 2.x
* 1.x: Decouple psr-http-message-bridge from extra.symfony.require for versions before 6.4 Fix keeping platform requirements when rebooting composer
2 parents 24eb099 + f1cf401 commit ae6dea6

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/Flex.php

+3
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,9 @@ private function reinstall(Event $event, bool $update)
814814
$composer->getEventDispatcher(),
815815
$composer->getAutoloadGenerator()
816816
);
817+
if (method_exists($installer, 'setPlatformRequirementFilter')) {
818+
$installer->setPlatformRequirementFilter(((array) $this->installer)["\0*\0platformRequirementFilter"]);
819+
}
817820

818821
if (!$update) {
819822
$installer->setUpdateAllowList(['php']);

src/PackageFilter.php

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function removeLegacyPackages(array $data, RootPackageInterface $rootPack
8080
!isset($knownVersions['splits'][$name])
8181
|| array_intersect($versions, $lockedVersions[$name] ?? [])
8282
|| (isset($rootConstraints[$name]) && !Intervals::haveIntersections($this->symfonyConstraints, $rootConstraints[$name]))
83+
|| ('symfony/psr-http-message-bridge' === $name && 6.4 > $versions[0])
8384
)) {
8485
$filteredPackages[] = $package;
8586
continue;

0 commit comments

Comments
 (0)