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

Merge pull request #3330 from stof/patch-1 

Fixed the resetting of the json file on removal failures
pull/3320/head
Jordi Boggiano 2014-10-06 15:46:27 +01:00
parent 26122cff43 4685b4bf49
commit a4b31108f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Command/RemoveCommand.php
View File

@ -59,11 +59,11 @@ EOT
$file = Factory::getComposerFile(); $file = Factory::getComposerFile();
$json = new JsonFile($file); $jsonFile = new JsonFile($file);
$composer = $json->read(); $composer = $jsonFile->read();
$composerBackup = file_get_contents($json->getPath()); $composerBackup = file_get_contents($jsonFile->getPath());
$json = new JsonConfigSource($json); $json = new JsonConfigSource($jsonFile);
$type = $input->getOption('dev') ? 'require-dev' : 'require'; $type = $input->getOption('dev') ? 'require-dev' : 'require';
$altType = !$input->getOption('dev') ? 'require-dev' : 'require'; $altType = !$input->getOption('dev') ? 'require-dev' : 'require';
@ -110,7 +110,7 @@ EOT
$status = $install->run(); $status = $install->run();
if ($status !== 0) { if ($status !== 0) {
$output->writeln("\n".'<error>Removal failed, reverting '.$file.' to its original content.</error>'); $output->writeln("\n".'<error>Removal failed, reverting '.$file.' to its original content.</error>');
file_put_contents($json->getPath(), $composerBackup); file_put_contents($jsonFile->getPath(), $composerBackup);
} }
return $status; return $status;