update: exception display, add required arg|opt get method...

Author: inhere

src/AbstractApp.php

@@ -38,7 +38,7 @@ abstract class AbstractApp
      */
     protected $config = [
         'env' => 'pdt', // dev test pdt
-        'debug' => false,
+        'debug' => true,
         'name' => 'My Console',
         'version' => '0.5.1',
         'publishAt' => '2017.03.24',
@@ -118,7 +118,7 @@ public function run($exit = true)
         // do run ...
         try {
             $returnCode = $this->dispatch($command);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             self::fire(self::ON_RUN_ERROR, [$e, $this]);
             $returnCode = $e->getCode() === 0 ? __LINE__ : $e->getCode();
             $this->dispatchExHandler($e);
@@ -243,7 +243,11 @@ public function command(string $name, $handler = null)
     public function commands(array $commands)
     {
         foreach ($commands as $name => $handler) {
-            $this->command($name, $handler);
+            if (is_int($name)) {
+                $this->command($handler);
+            } else {
+                $this->command($name, $handler);
+            }
         }
     }
 
@@ -253,20 +257,30 @@ public function commands(array $commands)
 
     /**
      * 运行异常处理
-     * @param \Exception $e
+     * @param \Exception|\Throwable $e
      * @throws \Exception
      */
-    protected function dispatchExHandler(\Exception $e)
+    protected function dispatchExHandler($e)
     {
         // $this->logger->ex($e);
 
         // open debug, throw exception
         if ($this->isDebug()) {
-            throw $e;
+            $message = sprintf(
+                "<bold>Exception(%d)</bold>: <red>%s</red>\nCalled At %s, Line: <cyan>%d</cyan>\nCatch the exception by: %s\nCode Trace:\n%s\n",
+                $e->getCode(),
+                $e->getMessage(),
+                $e->getFile(),
+                $e->getLine(),
+                get_class($e),
+                $e->getTraceAsString()
+            );
+
+            $this->output->write($message, false);
+        } else {
+            // simple output
+            $this->output->error('An error occurred! MESSAGE: ' . $e->getMessage());
         }
-
-        // no output
-        $this->output->error('An error occurred! MESSAGE: ' . $e->getMessage());
     }
 
     /**

src/App.php

@@ -14,10 +14,16 @@
  */
 class App extends AbstractApp
 {
+    /**
+     * @var string
+     */
+    private $delimiter = '/';
+
     /**
      * addCommand
-     * @param string  $name
-     * @param mixed   $controller
+     * @param string $name
+     * @param mixed $handler
+     * @return $this
      */
     public function addCommand(string $name, $handler = null)
     {
@@ -26,8 +32,9 @@ public function addCommand(string $name, $handler = null)
 
     /**
      * addGroup
-     * @param string      $name
+     * @param string $name
      * @param string|null $controller
+     * @return static
      */
     public function addGroup(string $name, string $controller = null)
     {
@@ -43,7 +50,7 @@ public function addGroup(string $name, string $controller = null)
      */
     protected function dispatch($name)
     {
-        $sep = '/';
+        $sep = $this->delimiter ?: '/';
 
         //// is a command name
 

src/io/Input.php

@@ -174,6 +174,20 @@ public function get($name, $default = null)
         return $this->args[$name] ?? $default;
     }
 
+    /**
+     * get a required argument
+     * @param int|string $name
+     * @return mixed
+     */
+    public function getRequiredArg($name)
+    {
+        if (isset($this->args[$name])) {
+            return $this->args[$name];
+        }
+
+        throw new \InvalidArgumentException("The argument '{$name}' is required");
+    }
+
     /**
      * get first argument
      * @param string $default
@@ -238,6 +252,20 @@ public function getOption(string $name, $default = null)
         return $this->getOpt($name, $default);
     }
 
+    /**
+     * get a required argument
+     * @param int|string $name
+     * @return mixed
+     */
+    public function getRequiredOpt($name)
+    {
+        if (null === ($val = $this->getOpt($name))) {
+            throw new \InvalidArgumentException("The option '{$name}' is required");
+        }
+
+        return $val;
+    }
+
     /**
      * get (long/short)opt value(bool)
      * eg: -h --help

src/io/Output.php

@@ -73,6 +73,22 @@ public function stderr($text = '', $nl = true)
         return $this;
     }
 
+    /**
+     * @param array ...$args
+     */
+    public function dumpVars(...$args)
+    {
+        echo Helper::dumpVars(...$args);
+    }
+
+    /**
+     * @param array ...$args
+     */
+    public function printVars(...$args)
+    {
+        echo Helper::printVars(...$args);
+    }
+
 /////////////////////////////////////////////////////////////////
 /// Getter/Setter
 /////////////////////////////////////////////////////////////////

src/utils/Helper.php

@@ -411,7 +411,7 @@ public static function wrapText($text, $indent = 0, $width = 0)
      * @param array ...$args
      * @return string
      */
-    public static function dumpVar(...$args)
+    public static function dumpVars(...$args)
     {
         ob_start();
         var_dump(...$args);
@@ -425,7 +425,7 @@ public static function dumpVar(...$args)
      * @param array ...$args
      * @return string
      */
-    public static function printR(...$args)
+    public static function printVars(...$args)
     {
         ob_start();