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

Ensure both bash and stty are present to assume cygwin, fixes #2857

pull/2856/merge
Jordi Boggiano 2014-03-31 15:14:47 +02:00
parent 6e16d53def
commit f56d315036
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/IO/ConsoleIO.php
View File

@ -15,7 +15,7 @@ namespace Composer\IO;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Helper\HelperSet; use Symfony\Component\Console\Helper\HelperSet;
use Composer\Util\ProcessExecutor; use Symfony\Component\Process\ExecutableFinder;
/** /**
* The Input/Output helper. * The Input/Output helper.
@ -170,12 +170,12 @@ class ConsoleIO extends BaseIO
*/ */
public function askAndHideAnswer($question) public function askAndHideAnswer($question)
{ {
$process = new ProcessExecutor($this);
// handle windows // handle windows
if (defined('PHP_WINDOWS_VERSION_BUILD')) { if (defined('PHP_WINDOWS_VERSION_BUILD')) {
$finder = new ExecutableFinder();
// use bash if it's present // use bash if it's present
if (0 === $process->execute("bash -c 'echo OK'", $output) && 'OK' === rtrim($output)) { if ($finder->find('bash') && $finder->find('stty')) {
$this->write($question, false); $this->write($question, false);
$value = rtrim(shell_exec('bash -c "stty -echo; read -r mypassword; stty echo; echo $mypassword"')); $value = rtrim(shell_exec('bash -c "stty -echo; read -r mypassword; stty echo; echo $mypassword"'));
$this->write(''); $this->write('');