mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-08-30 12:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进console模式

Browse Source
This commit is contained in:
yunwuxin
2016-06-13 18:48:07 +08:00
parent e14174fd63
commit eb026e02a6
4 changed files with 77 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
library/think/Console.php
View File

@@ -66,6 +66,26 @@ class Console
}
}
public static function init()
{
// 实例化console
$console = new self('Think Console', '0.1');
// 读取指令集
if (is_file(CONF_PATH . 'command' . EXT)) {
$commands = include CONF_PATH . 'command' . EXT;
if (is_array($commands)) {
foreach ($commands as $command) {
if (class_exists($command) && is_subclass_of($command, "\\think\\console\\command\\Command")) {
// 注册指令
$console->add(new $command());
}
}
}
}
// 运行
$console->run();
}
/**
* 执行当前的指令
* @return int
@@ -90,7 +110,7 @@ class Console
$exitCode = $e->getCode();
if (is_numeric($exitCode)) {
$exitCode = (int) $exitCode;
$exitCode = (int)$exitCode;
if (0 === $exitCode) {
$exitCode = 1;
}
@@ -201,7 +221,7 @@ class Console
*/
public function setCatchExceptions($boolean)
{
$this->catchExceptions = (bool) $boolean;
$this->catchExceptions = (bool)$boolean;
}
/**
@@ -211,7 +231,7 @@ class Console
*/
public function setAutoExit($boolean)
{
$this->autoExit = (bool) $boolean;
$this->autoExit = (bool)$boolean;
}
/**
@@ -379,7 +399,7 @@ class Console
$expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
return preg_quote($matches[1]) . '[^:]*';
}, $namespace);
$namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
$namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
if (empty($namespaces)) {
$message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -417,7 +437,7 @@ class Console
$expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
return preg_quote($matches[1]) . '[^:]*';
}, $name);
$commands = preg_grep('{^' . $expr . '}', $allCommands);
$commands = preg_grep('{^' . $expr . '}', $allCommands);
if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
if (false !== $pos = strrpos($name, ':')) {
@@ -606,19 +626,19 @@ class Console
if ('\\' === DS) {
if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
return [(int) $matches[1], (int) $matches[2]];
return [(int)$matches[1], (int)$matches[2]];
}
if (preg_match('/^(\d+)x(\d+)$/', $this->getConsoleMode(), $matches)) {
return [(int) $matches[1], (int) $matches[2]];
return [(int)$matches[1], (int)$matches[2]];
}
}
if ($sttyString = $this->getSttyColumns()) {
if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
return [(int) $matches[2], (int) $matches[1]];
return [(int)$matches[2], (int)$matches[1]];
}
if (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
return [(int) $matches[2], (int) $matches[1]];
return [(int)$matches[2], (int)$matches[1]];
}
}