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

Fix require reverting changes even though dependency resolution succeeded if when something fails afterwards, closes #10118

pull/10158/head
Jordi Boggiano 2021-10-14 15:41:44 +02:00
parent f776f52474
commit 759a3a9300
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/Command/RequireCommand.php
View File

@ -20,6 +20,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Composer\Factory; use Composer\Factory;
use Composer\Installer; use Composer\Installer;
use Composer\Installer\InstallerEvents;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Json\JsonManipulator; use Composer\Json\JsonManipulator;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
@ -52,6 +53,8 @@ class RequireCommand extends InitCommand
private $lock; private $lock;
/** @var ?string contents before modification if the lock file exists */ /** @var ?string contents before modification if the lock file exists */
private $lockBackup; private $lockBackup;
/** @var bool */
private $dependencyResolutionCompleted = false;
protected function configure() protected function configure()
{ {
@ -270,7 +273,9 @@ EOT
try { try {
return $this->doUpdate($input, $output, $io, $requirements, $requireKey, $removeKey); return $this->doUpdate($input, $output, $io, $requirements, $requireKey, $removeKey);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->revertComposerFile(false); if (!$this->dependencyResolutionCompleted) {
$this->revertComposerFile(false);
}
throw $e; throw $e;
} }
} }
@ -311,6 +316,14 @@ EOT
); );
} }
/**
* @private
*/
public function markSolverComplete()
{
$this->dependencyResolutionCompleted = true;
}
private function doUpdate(InputInterface $input, OutputInterface $output, IOInterface $io, array $requirements, $requireKey, $removeKey) private function doUpdate(InputInterface $input, OutputInterface $output, IOInterface $io, array $requirements, $requireKey, $removeKey)
{ {
// Update packages // Update packages
@ -318,6 +331,9 @@ EOT
$composer = $this->getComposer(true, $input->getOption('no-plugins')); $composer = $this->getComposer(true, $input->getOption('no-plugins'));
$composer->getEventDispatcher()->setRunScripts(!$input->getOption('no-scripts')); $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')) { if ($input->getOption('dry-run')) {
$rootPackage = $composer->getPackage(); $rootPackage = $composer->getPackage();
$links = array( $links = array(