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

Merge pull request #1383 from simensen/get-composer-file-static 

Made getComposerFile static.
pull/1380/merge
Jordi Boggiano 2012-12-03 04:07:04 -08:00
parent 23844bd6e5 8d1d060d66
commit ace3eefe1a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,7 @@ EOT
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$factory = new Factory; $file = Factory::getComposerFile();
$file = $factory->getComposerFile();
if (!file_exists($file)) { if (!file_exists($file)) {
$output->writeln('<error>'.$file.' not found.</error>'); $output->writeln('<error>'.$file.' not found.</error>');

4
src/Composer/Factory.php
View File

@ -113,7 +113,7 @@ class Factory
return $config; return $config;
} }
public function getComposerFile() public static function getComposerFile()
{ {
return getenv('COMPOSER') ?: 'composer.json'; return getenv('COMPOSER') ?: 'composer.json';
} }
@ -171,7 +171,7 @@ class Factory
{ {
// load Composer configuration // load Composer configuration
if (null === $localConfig) { if (null === $localConfig) {
$localConfig = $this->getComposerFile(); $localConfig = static::getComposerFile();
} }
if (is_string($localConfig)) { if (is_string($localConfig)) {