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

Fix bug on askAndHideAnswer() (because of the writeln() deletation)

pull/219/head
François Pluchino 2012-01-18 13:07:49 +01:00
parent 3cbe7cf590
commit 76deb2d302
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,16 +124,16 @@ class ConsoleIO implements IOInterface
. addslashes($question) . '", ""))'); . addslashes($question) . '", ""))');
$command = "cscript //nologo " . escapeshellarg($vbscript); $command = "cscript //nologo " . escapeshellarg($vbscript);
$this->write($question); $this->write($question, false);
$value = rtrim(shell_exec($command)); $value = rtrim(shell_exec($command));
unlink($vbscript); unlink($vbscript);
for ($i = 0; $i < strlen($value); ++$i) { for ($i = 0; $i < strlen($value); ++$i) {
$this->write('*'); $this->write('*', false);
} }
$this->writeln(''); $this->write('');
return $value; return $value;
} }
@ -142,22 +142,22 @@ class ConsoleIO implements IOInterface
if (rtrim(shell_exec($command)) === 'OK') { if (rtrim(shell_exec($command)) === 'OK') {
$command = "/usr/bin/env bash -c 'echo OK'"; $command = "/usr/bin/env bash -c 'echo OK'";
$this->write($question); $this->write($question, false);
$command = "/usr/bin/env bash -c 'read -s mypassword && echo \$mypassword'"; $command = "/usr/bin/env bash -c 'read -s mypassword && echo \$mypassword'";
$value = rtrim(shell_exec($command)); $value = rtrim(shell_exec($command));
for ($i = 0; $i < strlen($value); ++$i) { for ($i = 0; $i < strlen($value); ++$i) {
$this->write('*'); $this->write('*', false);
} }
$this->writeln(''); $this->write('');
return $value; return $value;
} }
// for other OS without shell_exec (does not hide the answer) // for other OS without shell_exec (does not hide the answer)
$this->writeln(''); $this->write('');
return $this->ask($question); return $this->ask($question);
} }