update some logic, add more unit test

Author: inhere

README.md

@@ -408,14 +408,14 @@ $output->write('hello <info>world<info>');
 
 ![alt text](docs/screenshots/output-color-text.png "Title")
 
-来自于类 `Inhere\Console\Utils\Show`。
+来自于类 `Inhere\Console\Util\Show`。
 
-> output 实例拥有 `Inhere\Console\Utils\Show` 的所有格式化输出方法。不过都是通过对象式访问的。
+> output 实例拥有 `Inhere\Console\Util\Show` 的所有格式化输出方法。不过都是通过对象式访问的。
 
 - **单独使用颜色风格**
 
 ```php
-$style = Inhere\Console\Components\Style\Style::create();
+$style = Inhere\Console\Component\Style\Style::create();
 
 echo $style->render('no color <info>color text</info>');
 
@@ -639,7 +639,7 @@ Show::helpPanel([
 
 ## 用户交互方法
 
-> 要独立使用的话需引入类 `Inhere\Console\Utils\Interact`， `Controller` 和 `Command` 里可以直接调用相关方法
+> 要独立使用的话需引入类 `Inhere\Console\Util\Interact`， `Controller` 和 `Command` 里可以直接调用相关方法
 
 ### 读取用户输入
 

README_en.md

@@ -188,7 +188,7 @@ $output->write('hello');
 
 ## more interactive
 
-in the class `Inhere\Console\Utils\Interact`
+in the class `Inhere\Console\Util\Interact`
 
 interactive method:
 

composer.json

@@ -21,8 +21,9 @@
     }
   ],
   "require": {
-    "php": ">7.0.0",
+    "php": ">7.1.0",
     "toolkit/cli-utils": "~1.0",
+    "toolkit/str-utils": "~1.0",
     "toolkit/sys-utils": "~1.0"
   },
   "autoload": {

examples/Commands/CorCommand.php

@@ -11,7 +11,7 @@
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
-use Inhere\Console\Utils\Helper;
+use Inhere\Console\Util\Helper;
 
 /**
  * Class CorCommand

examples/Controllers/HomeController.php

@@ -3,14 +3,14 @@
 namespace Inhere\Console\Examples\Controllers;
 
 use Toolkit\Cli\Cli;
-use Inhere\Console\Components\Symbol\ArtFont;
+use Inhere\Console\Component\Symbol\ArtFont;
 use Toolkit\Cli\Download;
 use Inhere\Console\Controller;
 use Inhere\Console\IO\Input;
-use Inhere\Console\Utils\Helper;
-use Inhere\Console\Utils\Interact;
-use Inhere\Console\Utils\ProgressBar;
-use Inhere\Console\Utils\Show;
+use Inhere\Console\Util\Helper;
+use Inhere\Console\Util\Interact;
+use Inhere\Console\Util\ProgressBar;
+use Inhere\Console\Util\Show;
 
 /**
  * default command controller. there are some command usage examples(1)

examples/Controllers/InteractController.php

@@ -9,8 +9,8 @@
 namespace Inhere\Console\Examples\Controllers;
 
 use Inhere\Console\Controller;
-use Inhere\Console\Utils\Interact;
-use Inhere\Console\Utils\Show;
+use Inhere\Console\Util\Interact;
+use Inhere\Console\Util\Show;
 use Toolkit\Cli\Terminal;
 
 /**

examples/Controllers/ShowController.php

@@ -8,12 +8,12 @@
 
 namespace Inhere\Console\Examples\Controllers;
 
-use Inhere\Console\Components\Symbol\Char;
-use Inhere\Console\Components\Symbol\Emoji;
+use Inhere\Console\Component\Symbol\Char;
+use Inhere\Console\Component\Symbol\Emoji;
 use Toolkit\Cli\Color;
 use Inhere\Console\Controller;
 use Inhere\Console\IO\Input;
-use Inhere\Console\Utils\Show;
+use Inhere\Console\Util\Show;
 use Toolkit\Cli\Highlighter;
 
 /**

examples/demo/progress_bar1.php

@@ -1,7 +1,7 @@
 <?php
 require dirname(__DIR__) . '/../../autoload.php';
 
-use Inhere\Console\Utils\ProgressBar;
+use Inhere\Console\Util\ProgressBar;
 
 $i = 1;
 $total = 100;

phar.build.inc

@@ -5,7 +5,7 @@
  * User: Inhere
  * Date: 2018/1/26 0026
  * Time: 22:11
- * @var \Inhere\Console\Components\PharCompiler $compiler
+ * @var \Inhere\Console\Component\PharCompiler $compiler
  */
 
 // config

src/AbstractApplication.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\BuiltIn\ErrorHandler;
+use Inhere\Console\Component\ErrorHandler;
 use Inhere\Console\Face\ApplicationInterface;
 use Inhere\Console\Face\CommandInterface;
 use Inhere\Console\Face\ErrorHandlerInterface;
@@ -18,9 +18,9 @@
 use Inhere\Console\IO\OutputInterface;
 use Inhere\Console\Traits\InputOutputAwareTrait;
 use Inhere\Console\Traits\SimpleEventTrait;
-use Inhere\Console\Components\Style\Style;
-use Inhere\Console\Utils\FormatUtil;
-use Inhere\Console\Utils\Helper;
+use Inhere\Console\Component\Style\Style;
+use Inhere\Console\Util\FormatUtil;
+use Inhere\Console\Util\Helper;
 
 /**
  * Class AbstractApplication
@@ -158,8 +158,9 @@ protected function beforeRun()
     }
 
     /**
-     * run app
+     * run application
      * @param bool $exit
+     * @return int|mixed
      * @throws \InvalidArgumentException
      */
     public function run(bool $exit = true)
@@ -175,10 +176,10 @@ public function run(bool $exit = true)
 
         // do run ...
         try {
-            $returnCode = $this->dispatch($command);
+            $result = $this->dispatch($command);
         } catch (\Throwable $e) {
             $this->fire(self::ON_RUN_ERROR, $e, $this);
-            $returnCode = $e->getCode() === 0 ? $e->getLine() : $e->getCode();
+            $result = $e->getCode() === 0 ? $e->getLine() : $e->getCode();
             $this->handleException($e);
         }
 
@@ -189,8 +190,10 @@ public function run(bool $exit = true)
         $this->afterRun();
 
         if ($exit) {
-            $this->stop((int)$returnCode);
+            $this->stop(\is_int($result) ? $result : 0);
         }
+
+        return $result;
     }
 
     /**