Fix require regression with --fixed, fixes #11247

composer · Jan 19, 2023 · f6f972a · f6f972a
1 parent 0d96fd8
commit f6f972a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php
@@ -338,7 +338,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $result = $this->doUpdate($input, $output, $io, $requirements, $requireKey, $removeKey);
             if ($result === 0 && count($requirementsToGuess) > 0) {
-                $result = $this->updateRequirementsAfterResolution($requirementsToGuess, $requireKey, $removeKey, $sortPackages, $input->getOption('dry-run'));
+                $result = $this->updateRequirementsAfterResolution($requirementsToGuess, $requireKey, $removeKey, $sortPackages, $input->getOption('dry-run'), $input->getOption('fixed'));
             }
 
             return $result;
@@ -506,7 +506,7 @@ private function doUpdate(InputInterface $input, OutputInterface $output, IOInte
     /**
      * @param list<string> $requirementsToUpdate
      */
-    private function updateRequirementsAfterResolution(array $requirementsToUpdate, string $requireKey, string $removeKey, bool $sortPackages, bool $dryRun): int
+    private function updateRequirementsAfterResolution(array $requirementsToUpdate, string $requireKey, string $removeKey, bool $sortPackages, bool $dryRun, bool $fixed): int
     {
         $composer = $this->requireComposer();
         $locker = $composer->getLocker();
@@ -523,7 +523,11 @@ private function updateRequirementsAfterResolution(array $requirementsToUpdate,
                 continue;
             }
 
-            $requirements[$packageName] = $versionSelector->findRecommendedRequireVersion($package);
+            if ($fixed) {
+                $requirements[$packageName] = $package->getPrettyVersion();
+            } else {
+                $requirements[$packageName] = $versionSelector->findRecommendedRequireVersion($package);
+            }
             $this->getIO()->writeError(sprintf(
                 'Using version <info>%s</info> for <info>%s</info>',
                 $requirements[$packageName],

diff --git a/tests/Composer/Test/Command/RequireCommandTest.php b/tests/Composer/Test/Command/RequireCommandTest.php
@@ -236,6 +236,30 @@ public static function provideRequire(): \Generator
   - Locking existing/dep (1.1.0)
   - Locking required/pkg (1.1.0)
 Using version ^1.1 for required/pkg
+OUTPUT
+        ];
+
+        yield 'use exact constraint with --fixed' => [
+            [
+                'type' => 'project',
+                'repositories' => [
+                    'packages' => [
+                        'type' => 'package',
+                        'package' => [
+                            ['name' => 'required/pkg', 'version' => '1.1.0'],
+                        ],
+                    ],
+                ],
+            ],
+            ['packages' => ['required/pkg'], '--no-install' => true, '--fixed' => true],
+            <<<OUTPUT
+./composer.json has been updated
+Running composer update required/pkg
+Loading composer repositories with package information
+Updating dependencies
+Lock file operations: 1 install, 0 updates, 0 removals
+  - Locking required/pkg (1.1.0)
+Using version 1.1.0 for required/pkg
 OUTPUT
         ];
     }