mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 23:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正Console

Browse Source
This commit is contained in:
thinkphp
2016-06-09 10:45:19 +08:00
parent 3c57c610dc
commit 399e7b4573
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/console/helper/Process.php
View File

@@ -12,8 +12,8 @@
namespace think\console\helper; namespace think\console\helper;
use think\console\Output; use think\console\Output;
use think\Process as ThinkProcess;
use think\process\Builder as ProcessBuilder; use think\process\Builder as ProcessBuilder;
use think\process as ThinkProcess;
use think\process\exception\Failed as ProcessFailedException; use think\process\exception\Failed as ProcessFailedException;
class Process extends Helper class Process extends Helper

16
library/think/console/helper/Question.php
View File

@@ -11,16 +11,16 @@
namespace think\console\helper; namespace think\console\helper;
use think\console\helper\question\Choice as ChoiceQuestion;
use think\console\helper\question\Question as OutputQuestion;
use think\console\Input; use think\console\Input;
use think\console\Output; use think\console\Output;
use think\console\helper\question\Question as OutputQuestion;
use think\console\helper\question\Choice as ChoiceQuestion;
use think\console\output\formatter\Style as OutputFormatterStyle; use think\console\output\formatter\Style as OutputFormatterStyle;
class Question extends Helper class Question extends Helper
{ {
private $inputStream; private $inputStream;
private static $shell; private static $shell;
private static $stty; private static $stty;
@@ -138,7 +138,7 @@ class Question extends Helper
if ($question instanceof ChoiceQuestion) { if ($question instanceof ChoiceQuestion) {
$width = max(array_map('strlen', array_keys($question->getChoices()))); $width = max(array_map('strlen', array_keys($question->getChoices())));
$messages = (array)$question->getQuestion(); $messages = (array) $question->getQuestion();
foreach ($question->getChoices() as $key => $value) { foreach ($question->getChoices() as $key => $value) {
$messages[] = sprintf(" [<info>%-${width}s</info>] %s", $key, $value); $messages[] = sprintf(" [<info>%-${width}s</info>] %s", $key, $value);
} }
@@ -199,7 +199,7 @@ class Question extends Helper
$output->write("\033[1D"); $output->write("\033[1D");
} }
if ($i === 0) { if (0 === $i) {
$ofs = -1; $ofs = -1;
$matches = $autocomplete; $matches = $autocomplete;
$numMatches = count($matches); $numMatches = count($matches);
@@ -249,7 +249,7 @@ class Question extends Helper
$ofs = 0; $ofs = 0;
foreach ($autocomplete as $value) { foreach ($autocomplete as $value) {
if (0 === strpos($value, $ret) && $i !== strlen($value)) { if (0 === strpos($value, $ret) && strlen($value) !== $i) {
$matches[$numMatches++] = $value; $matches[$numMatches++] = $value;
} }
} }
@@ -314,7 +314,7 @@ class Question extends Helper
} }
if (false !== $shell = $this->getShell()) { if (false !== $shell = $this->getShell()) {
$readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword'; $readCmd = 'csh' === $shell ? 'set mypassword = $<' : 'read -r mypassword';
$command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd); $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
$value = rtrim(shell_exec($command)); $value = rtrim(shell_exec($command));
$output->writeln(''); $output->writeln('');
@@ -389,6 +389,6 @@ class Question extends Helper
exec('stty 2>&1', $output, $exitcode); exec('stty 2>&1', $output, $exitcode);
return self::$stty = $exitcode === 0; return self::$stty = 0 === $exitcode;
} }
} }