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

use COMPOSER env var if present for ancestor path search

pull/6598/head
David Zuelke 2017-08-08 18:08:46 +02:00 committed by Jordi Boggiano
parent 4f7b6a3a54
commit a4d84f15ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Console/Application.php
View File

@ -127,13 +127,13 @@ class Application extends BaseApplication
} }
// prompt user for dir change if no composer.json is present in current dir // prompt user for dir change if no composer.json is present in current dir
if ($io->isInteractive() && !in_array($commandName, array('init', 'about', 'help', 'diagnose', 'self-update', 'global'), true) && !file_exists('./composer.json')) { if ($io->isInteractive() && !in_array($commandName, array('init', 'about', 'help', 'diagnose', 'self-update', 'global'), true) && !file_exists(Factory::getComposerFile())) {
$dir = dirname(getcwd()); $dir = dirname(getcwd());
$home = realpath(getenv('HOME') ?: getenv('USERPROFILE') ?: '/'); $home = realpath(getenv('HOME') ?: getenv('USERPROFILE') ?: '/');
// abort when we reach the home dir or top of the filesystem // abort when we reach the home dir or top of the filesystem
while (dirname($dir) !== $dir && $dir !== $home) { while (dirname($dir) !== $dir && $dir !== $home) {
if (file_exists($dir.'/composer.json')) { if (file_exists($dir.'/'.Factory::getComposerFile())) {
if ($io->askConfirmation('<info>No composer.json in current directory, do you want to use the one at '.$dir.'?</info> [<comment>Y,n</comment>]? ', true)) { if ($io->askConfirmation('<info>No composer.json in current directory, do you want to use the one at '.$dir.'?</info> [<comment>Y,n</comment>]? ', true)) {
$oldWorkingDir = getcwd(); $oldWorkingDir = getcwd();
chdir($dir); chdir($dir);