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
symfony · Oct 30, 2023 · ae6dea6 · ae6dea6
2 parents 24eb099 + f1cf401
commit ae6dea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Flex.php b/src/Flex.php
@@ -814,6 +814,9 @@ private function reinstall(Event $event, bool $update)
             $composer->getEventDispatcher(),
             $composer->getAutoloadGenerator()
         );
+        if (method_exists($installer, 'setPlatformRequirementFilter')) {
+            $installer->setPlatformRequirementFilter(((array) $this->installer)["\0*\0platformRequirementFilter"]);
+        }
 
         if (!$update) {
             $installer->setUpdateAllowList(['php']);

diff --git a/src/PackageFilter.php b/src/PackageFilter.php
@@ -80,6 +80,7 @@ public function removeLegacyPackages(array $data, RootPackageInterface $rootPack
                 !isset($knownVersions['splits'][$name])
                 || array_intersect($versions, $lockedVersions[$name] ?? [])
                 || (isset($rootConstraints[$name]) && !Intervals::haveIntersections($this->symfonyConstraints, $rootConstraints[$name]))
+                || ('symfony/psr-http-message-bridge' === $name && 6.4 > $versions[0])
             )) {
                 $filteredPackages[] = $package;
                 continue;