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

Merge pull request #5824 from fabpot/small-refacto 

Code simplification
pull/5840/head
Jordi Boggiano 2016-11-03 01:01:45 +01:00 committed by GitHub
parent cf48bfccb4 b823242ae3
commit 9cf93b0c88
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,6 @@ EOT
} }
$json = new JsonFile($file); $json = new JsonFile($file);
$composerDefinition = $json->read();
$composerBackup = file_get_contents($json->getPath()); $composerBackup = file_get_contents($json->getPath());
$composer = $this->getComposer(true, $input->getOption('no-plugins')); $composer = $this->getComposer(true, $input->getOption('no-plugins'));
@ -112,7 +111,6 @@ EOT
$requireKey = $input->getOption('dev') ? 'require-dev' : 'require'; $requireKey = $input->getOption('dev') ? 'require-dev' : 'require';
$removeKey = $input->getOption('dev') ? 'require' : 'require-dev'; $removeKey = $input->getOption('dev') ? 'require' : 'require-dev';
$baseRequirements = array_key_exists($requireKey, $composerDefinition) ? $composerDefinition[$requireKey] : array();
$requirements = $this->formatRequirements($requirements); $requirements = $this->formatRequirements($requirements);
// validate requirements format // validate requirements format
@ -123,16 +121,12 @@ EOT
$sortPackages = $input->getOption('sort-packages') || $composer->getConfig()->get('sort-packages'); $sortPackages = $input->getOption('sort-packages') || $composer->getConfig()->get('sort-packages');
if (!$this->updateFileCleanly($json, $baseRequirements, $requirements, $requireKey, $removeKey, $sortPackages)) { if (!$this->updateFileCleanly($json, $requirements, $requireKey, $removeKey, $sortPackages)) {
$composerDefinition = $json->read();
foreach ($requirements as $package => $version) { foreach ($requirements as $package => $version) {
$baseRequirements[$package] = $version; $composerDefinition[$requireKey][$package] = $version;
if (isset($composerDefinition[$removeKey][$package])) {
unset($composerDefinition[$removeKey][$package]); unset($composerDefinition[$removeKey][$package]);
} }
}
$composerDefinition[$requireKey] = $baseRequirements;
$json->write($composerDefinition); $json->write($composerDefinition);
} }
@ -194,7 +188,7 @@ EOT
return $status; return $status;
} }
private function updateFileCleanly($json, array $base, array $new, $requireKey, $removeKey, $sortPackages) private function updateFileCleanly($json, array $new, $requireKey, $removeKey, $sortPackages)
{ {
$contents = file_get_contents($json->getPath()); $contents = file_get_contents($json->getPath());