Fix require reverting changes even though dependency resolution succe…

…eded if when something fails afterwards, closes #10118
composer · Oct 14, 2021 · 759a3a9 · 759a3a9
1 parent f776f52
commit 759a3a9
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Composer\Factory;
 use Composer\Installer;
+use Composer\Installer\InstallerEvents;
 use Composer\Json\JsonFile;
 use Composer\Json\JsonManipulator;
 use Composer\Package\Version\VersionParser;
@@ -52,6 +53,8 @@ class RequireCommand extends InitCommand
     private $lock;
     /** @var ?string contents before modification if the lock file exists */
     private $lockBackup;
+    /** @var bool */
+    private $dependencyResolutionCompleted = false;
 
     protected function configure()
     {
@@ -270,7 +273,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             return $this->doUpdate($input, $output, $io, $requirements, $requireKey, $removeKey);
         } catch (\Exception $e) {
-            $this->revertComposerFile(false);
+            if (!$this->dependencyResolutionCompleted) {
+                $this->revertComposerFile(false);
+            }
             throw $e;
         }
     }
@@ -311,13 +316,24 @@ private function getPackagesByRequireKey()
         );
     }
 
+    /**
+     * @private
+     */
+    public function markSolverComplete()
+    {
+        $this->dependencyResolutionCompleted = true;
+    }
+
     private function doUpdate(InputInterface $input, OutputInterface $output, IOInterface $io, array $requirements, $requireKey, $removeKey)
     {
         // Update packages
         $this->resetComposer();
         $composer = $this->getComposer(true, $input->getOption('no-plugins'));
         $composer->getEventDispatcher()->setRunScripts(!$input->getOption('no-scripts'));
 
+        $this->dependencyResolutionCompleted = false;
+        $composer->getEventDispatcher()->addListener(InstallerEvents::PRE_OPERATIONS_EXEC, [$this, 'markSolverComplete'], 10000);
+
         if ($input->getOption('dry-run')) {
             $rootPackage = $composer->getPackage();
             $links = array(