From b0da7db3af74522881c5fa34858adc5768024e0b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 8 Aug 2017 18:08:46 +0200 Subject: [PATCH] use COMPOSER env var if present for ancestor path search --- src/Composer/Console/Application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 96ba7d900..081476d93 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -127,13 +127,13 @@ class Application extends BaseApplication } // 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()); $home = realpath(getenv('HOME') ?: getenv('USERPROFILE') ?: '/'); // abort when we reach the home dir or top of the filesystem while (dirname($dir) !== $dir && $dir !== $home) { - if (file_exists($dir.'/composer.json')) { + if (file_exists($dir.'/'.Factory::getComposerFile())) { if ($io->askConfirmation('No composer.json in current directory, do you want to use the one at '.$dir.'? [Y,n]? ', true)) { $oldWorkingDir = getcwd(); chdir($dir);