rename some dirs

inhere · inhere · commit da86222905ed · 2019-01-01T15:08:23.000+08:00
diff --git a/README.md b/README.md
@@ -229,9 +229,9 @@ $app->command(TestCommand::class);
 
 ```php
 // 独立命令
-$app->registerCommands('App\\Console\\Commands', dirname(__DIR__) . '/Commands');
+$app->registerCommands('App\\Console\\Command', dirname(__DIR__) . '/Commands');
 // 命令组
-$app->registerGroups('App\\Console\\Controllers', dirname(__DIR__) . '/Controllers');
+$app->registerGroups('App\\Console\\Controller', dirname(__DIR__) . '/Controllers');
 ```
 
 ### 一些说明
diff --git a/examples/Command/CorCommand.php b/examples/Command/CorCommand.php
@@ -6,7 +6,7 @@
  * Time: 17:47
  */
 
-namespace Inhere\Console\Examples\Commands;
+namespace Inhere\Console\Examples\Command;
 
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;
@@ -15,7 +15,7 @@
 
 /**
  * Class CorCommand
- * @package Inhere\Console\Examples\Commands
+ * @package Inhere\Console\Examples\Command
  */
 class CorCommand extends Command
 {
diff --git a/examples/Command/DemoCommand.php b/examples/Command/DemoCommand.php
@@ -6,15 +6,15 @@
  * Time: 18:58
  */
 
-namespace Inhere\Console\Examples\Commands;
+namespace Inhere\Console\Examples\Command;
 
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
 
 /**
  * Class DemoCommand
- * @package Inhere\Console\Examples\Commands
+ * @package Inhere\Console\Examples\Command
  */
 class DemoCommand extends Command
 {
diff --git a/examples/Command/TestCommand.php b/examples/Command/TestCommand.php
@@ -6,14 +6,14 @@
  * Time: 18:58
  */
 
-namespace Inhere\Console\Examples\Commands;
+namespace Inhere\Console\Examples\Command;
 
 use Inhere\Console\Command;
 use Inhere\Console\IO\Output;
 
 /**
  * Class Test
- * @package Inhere\Console\Examples\Commands
+ * @package Inhere\Console\Examples\Command
  */
 class TestCommand extends Command
 {
diff --git a/examples/Controller/HomeController.php b/examples/Controller/HomeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Inhere\Console\Examples\Controllers;
+namespace Inhere\Console\Examples\Controller;
 
 use Toolkit\Cli\Cli;
 use Inhere\Console\Component\Symbol\ArtFont;
@@ -15,7 +15,7 @@
 /**
  * default command controller. there are some command usage examples(1)
  * Class HomeController
- * @package Inhere\Console\Examples\Controllers
+ * @package Inhere\Console\Examples\Controller
  */
 class HomeController extends Controller
 {
diff --git a/examples/Controller/InteractController.php b/examples/Controller/InteractController.php
@@ -6,7 +6,7 @@
  * Time: 14:27
  */
 
-namespace Inhere\Console\Examples\Controllers;
+namespace Inhere\Console\Examples\Controller;
 
 use Inhere\Console\Controller;
 use Inhere\Console\Util\Interact;
@@ -15,7 +15,7 @@
 
 /**
  * Class InteractController
- * @package Inhere\Console\Examples\Controllers
+ * @package Inhere\Console\Examples\Controller
  */
 class InteractController extends Controller
 {
diff --git a/examples/Controller/ProcessController.php b/examples/Controller/ProcessController.php
@@ -6,15 +6,15 @@
  * Time: 11:44
  */
 
-namespace Inhere\Console\Examples\Controllers;
+namespace Inhere\Console\Examples\Controller;
 
 use Inhere\Console\Controller;
 use Toolkit\Sys\ProcessUtil;
 use Toolkit\Sys\Sys;
 
 /**
  * Class ProcessController
- * @package Inhere\Console\Examples\Controllers
+ * @package Inhere\Console\Examples\Controller
  */
 class ProcessController extends Controller
 {
diff --git a/examples/Controller/ShowController.php b/examples/Controller/ShowController.php
@@ -6,7 +6,7 @@
  * Time: 14:27
  */
 
-namespace Inhere\Console\Examples\Controllers;
+namespace Inhere\Console\Examples\Controller;
 
 use Inhere\Console\Component\Symbol\Char;
 use Inhere\Console\Component\Symbol\Emoji;
@@ -18,7 +18,7 @@
 
 /**
  * Class ShowController
- * @package Inhere\Console\Examples\Controllers
+ * @package Inhere\Console\Examples\Controller
  */
 class ShowController extends Controller
 {
diff --git a/examples/alone b/examples/alone
@@ -4,7 +4,7 @@
  * only run a controller.
  */
 
-use Inhere\Console\Examples\Controllers\HomeController;
+use Inhere\Console\Examples\Controller\HomeController;
 
 define('BASE_PATH', dirname(__DIR__));
 
diff --git a/examples/alone-app b/examples/alone-app
@@ -4,7 +4,7 @@
  * only run a controller.
  */
 
-use Inhere\Console\Examples\Controllers\HomeController;
+use Inhere\Console\Examples\Controller\HomeController;
 
 define('BASE_PATH', dirname(__DIR__));
 
diff --git a/examples/commands.php b/examples/commands.php
@@ -9,11 +9,11 @@
 
 use Inhere\Console\BuiltIn\PharController;
 use Inhere\Console\BuiltIn\SelfUpdateCommand;
-use Inhere\Console\Examples\Commands\CorCommand;
-use Inhere\Console\Examples\Commands\DemoCommand;
-use Inhere\Console\Examples\Commands\TestCommand;
-use Inhere\Console\Examples\Controllers\HomeController;
-use Inhere\Console\Examples\Controllers\ProcessController;
+use Inhere\Console\Examples\Command\CorCommand;
+use Inhere\Console\Examples\Command\DemoCommand;
+use Inhere\Console\Examples\Command\TestCommand;
+use Inhere\Console\Examples\Controller\HomeController;
+use Inhere\Console\Examples\Controller\ProcessController;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
 
@@ -42,8 +42,8 @@
     'aliases' => 'prc'
 ]);
 $app->controller(PharController::class);
-$app->controller(\Inhere\Console\Examples\Controllers\ShowController::class);
-$app->controller(\Inhere\Console\Examples\Controllers\InteractController::class);
+$app->controller(\Inhere\Console\Examples\Controller\ShowController::class);
+$app->controller(\Inhere\Console\Examples\Controller\InteractController::class);
 
 // add alias for a group command.
 $app->addCommandAliases('home:test', 'h-test');
diff --git a/src/Component/Formatter/Panel.php b/src/Component/Formatter/Panel.php
@@ -7,6 +7,7 @@
  */
 
 namespace Inhere\Console\Component\Formatter;
+
 use Inhere\Console\Component\StrBuffer;
 use Inhere\Console\Util\FormatUtil;
 
@@ -110,12 +111,10 @@ public function toString(): string
                 }
 
                 $value = rtrim($temp, ' ,');
+            } elseif (\is_bool($value)) {
+                $value = $value ? 'True' : 'False';
             } else {
-                if (\is_bool($value)) {
-                    $value = $value ? 'True' : 'False';
-                } else {
-                    $value = trim((string)$value);
-                }
+                $value = trim((string)$value);
             }
 
             // get value width
diff --git a/src/LiteApp.php b/src/LiteApp.php
@@ -115,18 +115,18 @@ public function runHandler(string $command, $handler)
                 return $handler($this);
             }
 
-            if (class_exists($handler)) {
+            if (\class_exists($handler)) {
                 $handler = new $handler;
 
                 // $handler->execute()
-                if (method_exists($handler, 'execute')) {
+                if (\method_exists($handler, 'execute')) {
                     return $handler->execute($this);
                 }
             }
         }
 
         // a \Closure OR $handler->__invoke()
-        if (method_exists($handler, '__invoke')) {
+        if (\method_exists($handler, '__invoke')) {
             return $handler($this);
         }
 
@@ -177,13 +177,11 @@ public function parseCliArgv()
                 } else {
                     $this->opts[$value] = true;
                 }
+            } elseif (strpos($value, '=')) {
+                list($n, $v) = explode('=', $value);
+                $this->args[$n] = $v;
             } else {
-                if (strpos($value, '=')) {
-                    list($n, $v) = explode('=', $value);
-                    $this->args[$n] = $v;
-                } else {
-                    $this->args[] = $value;
-                }
+                $this->args[] = $value;
             }
         }
     }
diff --git a/src/Util/FormatUtil.php b/src/Util/FormatUtil.php
@@ -346,12 +346,10 @@ public static function spliceKeyValue(array $data, array $opts = []): string
                 }
 
                 $value = \rtrim($temp, ' ,');
+            } elseif (\is_bool($value)) {
+                $value = $value ? '(True)' : '(False)';
             } else {
-                if (\is_bool($value)) {
-                    $value = $value ? '(True)' : '(False)';
-                } else {
-                    $value = (string)$value;
-                }
+                $value = (string)$value;
             }
 
             $value = $hasKey && $opts['ucFirst'] ? \ucfirst($value) : $value;
diff --git a/src/Util/InputParser.php b/src/Util/InputParser.php
@@ -114,14 +114,11 @@ public static function fromArgv(array $params, array $config = []): array
                     } else {
                         $lOpts[$opt] = $val;
                     }
-                } else {
-                    if ($isArray) {
-                        $sOpts[$opt][] = $val;
-                    } else {
-                        $sOpts[$opt] = $val;
-                    }
+                } elseif ($isArray) { // short
+                    $sOpts[$opt][] = $val;
+                } else { // short
+                    $sOpts[$opt] = $val;
                 }
-
                 // arguments: param doesn't belong to any option, define it is args
             } else {
                 // value specified inline (<arg>=<value>)
diff --git a/src/Util/Show.php b/src/Util/Show.php
@@ -605,12 +605,10 @@ public static function panel($data, string $title = 'Information Panel', array $
                 }
 
                 $value = \rtrim($temp, ' ,');
+            } elseif (\is_bool($value)) {
+                $value = $value ? 'True' : 'False';
             } else {
-                if (\is_bool($value)) {
-                    $value = $value ? 'True' : 'False';
-                } else {
-                    $value = \trim((string)$value);
-                }
+                $value = \trim((string)$value);
             }
 
             // get value width
