合并主干的功能更新和调整到 php5 分支

- 参数解析逻辑调整
- 功能更新调整
- 完善文档信息
- 其他调整

Author: inhere

README_zh.md

@@ -26,8 +26,8 @@
 编辑 `composer.json`，在 `require` 添加
 
 ```
-"inhere/console": "dev-master",
-// "inhere/console": "dev-php5", // for php5
+"inhere/console": "dev-php5", 
+// "inhere/console": "dev-master", // for php7
 ```
 
 然后执行: `composer update`
@@ -68,7 +68,7 @@ $app->run();
 
 然后在命令行里执行 `php examples/app`, 立即就可以看到如下输出了:
 
-```bash
+```
 $ php examples/app
 Usage:
   examples/app [route|command] [arg1=value1 arg2=value ...] [-v|-h ...]

examples/HomeController.php

@@ -198,7 +198,7 @@ public function downCommand()
         $url = $this->input->getArg('url');
 
         if (!$url) {
-            \inhere\console\utils\Show::error('Please input you want to downloaded file url, use: url=[url]', 1);
+            $this->output->error('Please input you want to downloaded file url, use: url=[url]', 1);
         }
 
         $saveAs = $this->input->getArg('saveAs');
@@ -211,7 +211,7 @@ public function downCommand()
         $goon = Interact::confirm("Now, will download $url to $saveAs, go on");
 
         if (!$goon) {
-            \inhere\console\utils\Show::notice('Quit download, Bye!');
+            $this->output->notice('Quit download, Bye!');
 
             return 0;
         }

examples/baks/OldInput.php

@@ -85,7 +85,7 @@ protected static function parseOption($item, &$opts)
         // is a have value option. eg: `-s=test --page=23`
         if (strpos($item, '=')) {
             $item = trim($item, '-= ');
-            [$name, $val] = explode('=', $item);
+            list($name, $val) = explode('=', $item);
             $tVal = strtolower($val);
 
             // check it is a bool value.
@@ -145,7 +145,7 @@ protected static function parseArgument($item, &$args)
 
         // eg: `name=john`
         if (strpos($item, '=')) {
-            [$name, $val] = explode('=', $item);
+            list($name, $val) = explode('=', $item);
 
             // is array. eg: `name=john name=tom`
             if (isset($args[$name])) {

src/AbstractApp.php

@@ -154,7 +154,7 @@ public function stop($code = 0)
      * @param string $controller The controller class
      * @return static
      */
-    public function controller(string $name, string $controller)
+    public function controller($name, $controller)
     {
         if (!$name || !$controller) {
             throw new \InvalidArgumentException('Parameters are not allowed to is empty!');
@@ -187,7 +187,7 @@ public function controllers(array $controllers)
      * @param string|\Closure $handler
      * @return $this
      */
-    public function command(string $name, $handler)
+    public function command($name, $handler)
     {
         if (!$name || !$handler) {
             throw new \InvalidArgumentException('Parameters are not allowed to is empty!');
@@ -214,7 +214,7 @@ public function commands(array $commands)
     /**
      * @return array
      */
-    public static function hooks(): array
+    public static function hooks()
     {
         return array_keys(self::$hooks);
     }
@@ -223,7 +223,7 @@ public static function hooks(): array
      * @param $event
      * @param callable $handler
      */
-    public function on(string $event, callable $handler)
+    public function on($event, callable $handler)
     {
         if (isset(self::$hooks[$event])) {
             self::$hooks[$event] = $handler;
@@ -233,7 +233,7 @@ public function on(string $event, callable $handler)
     /**
      * @return array
      */
-    public function getInternalCommands(): array
+    public function getInternalCommands()
     {
         return $this->internalCommands;
     }
@@ -242,7 +242,7 @@ public function getInternalCommands(): array
      * @param $name
      * @return bool
      */
-    public function isInternalCommand(string $name): bool
+    public function isInternalCommand($name)
     {
         return isset($this->internalCommands[$name]);
     }
@@ -278,7 +278,7 @@ public function config($name, $default = null)
             }
         }
 
-        return $this->config[$name] ?? $default;
+        return isset($this->config[$name]) ? $this->config[$name] : $default;
     }
 
     /**
@@ -296,7 +296,7 @@ public function setConfig(array $config)
      * get config
      * @return array
      */
-    public function getConfig(): array
+    public function getConfig()
     {
         return $this->config;
     }
@@ -305,7 +305,7 @@ public function getConfig(): array
      * is Debug
      * @return boolean
      */
-    public function isDebug(): bool
+    public function isDebug()
     {
         return (bool)$this->config['debug'];
     }
@@ -314,7 +314,7 @@ public function isDebug(): bool
      * @param $name
      * @param bool $isGroup
      */
-    protected function checkName(string $name, $isGroup = false)
+    protected function checkName($name, $isGroup = false)
     {
         $pattern = $isGroup ? '/^[a-z][\w-]+$/' : '/^[a-z][\w-]*:?([a-z][\w-]+)?$/';
 

src/AbstractCommand.php

@@ -62,34 +62,34 @@ protected function afterRun($action)
     /**
      * handle action/command runtime exception
      *
-     * @param  \Throwable $e
-     * @throws \Throwable
+     * @param  \Exception $e
+     * @throws \Exception
      */
-    protected function handleRuntimeException(\Throwable $e)
+    protected function handleRuntimeException(\Exception $e)
     {
         throw $e;
     }
 
     /**
      * @param string $name
      */
-    public function setName(string $name)
+    public function setName($name)
     {
         $this->name = $name;
     }
 
     /**
      * @return string
      */
-    public function getName(): string
+    public function getName()
     {
         return $this->name;
     }
 
     /**
      * @return array
      */
-    public static function getAllowTags(): array
+    public static function getAllowTags()
     {
         return self::$allowTags;
     }

src/Controller.php

@@ -190,7 +190,7 @@ final protected function showCommandList()
     /**
      * @return string
      */
-    public function getDefaultAction(): string
+    public function getDefaultAction()
     {
         return $this->defaultAction;
     }
@@ -206,7 +206,7 @@ public function setDefaultAction($defaultAction)
     /**
      * @return string
      */
-    public function getActionSuffix(): string
+    public function getActionSuffix()
     {
         return $this->actionSuffix;
     }
@@ -274,7 +274,7 @@ protected function parseDocCommentTags($comment)
      * @param  $comment
      * @return string
      */
-    protected function parseDocCommentSummary($comment): string
+    protected function parseDocCommentSummary($comment)
     {
         $docLines = preg_split('~\R~u', $comment);
 
@@ -291,7 +291,7 @@ protected function parseDocCommentSummary($comment): string
      * @param  $comment
      * @return string
      */
-    protected function parseDocCommentDetail($comment): string
+    protected function parseDocCommentDetail($comment)
     {
         $comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($comment, '/'))), "\r", '');
 

src/Helper.php

@@ -241,7 +241,7 @@ public static function spliceKeyValue(array $data, array $opts = [])
      * Returns true if the console is running on windows
      * @return boolean
      */
-    public static function isOnWindows(): bool
+    public static function isOnWindows()
     {
         return DIRECTORY_SEPARATOR === '\\';
     }
@@ -346,25 +346,28 @@ public static function wrapText($text, $indent = 0, $width = 0)
 
     /**
      * dump vars
-     * @param array ...$args
      * @return string
      */
-    public static function dumpVar(...$args)
+    public static function dumpVar()
     {
+        $args = func_get_args();
+
         ob_start();
-        var_dump(...$args);
+        foreach ($args as $arg) {
+            print_r($arg);
+        }
         $string = ob_get_clean();
 
         return preg_replace("/=>\n\s+/", '=> ', $string);
     }
 
     /**
      * print vars
-     * @param array ...$args
      * @return string
      */
-    public static function printR(...$args)
+    public static function printR()
     {
+        $args = func_get_args();
         ob_start();
 
         foreach ($args as $arg) {