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

Fix formatRequirements return value, fixes #1026

pull/1026/merge
Jordi Boggiano 2012-08-24 13:38:54 +02:00
parent 99c33a54fd
commit 41fc6ff9ee
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Command/InitCommand.php
View File

@ -88,12 +88,16 @@ EOT
unset($options['author']); unset($options['author']);
} }
$options['require'] = isset($options['require']) ? $options['require'] = isset($options['require']) ? $this->formatRequirements($options['require']) : new \stdClass;
$this->formatRequirements($options['require']) : if (array() === $options['require']) {
new \stdClass; $options['require'] = new \stdClass;
}
if (isset($options['require-dev'])) { if (isset($options['require-dev'])) {
$options['require-dev'] = $this->formatRequirements($options['require-dev']) ; $options['require-dev'] = $this->formatRequirements($options['require-dev']) ;
if (array() === $options['require-dev']) {
$options['require-dev'] = new \stdClass;
}
} }
$file = new JsonFile('composer.json'); $file = new JsonFile('composer.json');
@ -360,7 +364,7 @@ EOT
$requires[$packageName] = $packageVersion; $requires[$packageName] = $packageVersion;
} }
return empty($requires) ? new \stdClass : $requires; return $requires;
} }
protected function normalizeRequirement($requirement) protected function normalizeRequirement($requirement)