some bug fixed. update

Author: inhere

src/console/ConsoleHelper.php

@@ -48,7 +48,7 @@ public static function isInteractive($fileDescriptor)
      * ]
      * @return int
      */
-    public static function keyMaxWidth(array $data, $expactInt = true)
+    public static function getKeyMaxWidth(array $data, $expactInt = true)
     {
         $keyMaxWidth = 0;
 
@@ -71,18 +71,31 @@ public static function keyMaxWidth(array $data, $expactInt = true)
      *     'version'  => '4.4.5',
      * ]
      * @param  int    $keyMaxWidth
-     * @param  string $sepChar  e.g ' | ' => OUT: key | value
-     * @param  string $leftChar e.g ' * '
+     * @param  array  $opts
      * @return string
      */
-    public static function spliceKeyValue(array $data, $keyMaxWidth, $sepChar = ' ', $leftChar='')
+    public static function spliceKeyValue(array $data, array $opts = [])
     {
         $text = '';
+        $opts = array_merge([
+            'leftChar'    => '',   // e.g '  ', ' * '
+            'sepChar'     => ' ',  // e.g ' | ' => OUT: key | value
+            'keyStyle'    => '',   // e.g 'info','commont'
+            'keyMaxWidth' => null, // if not set, will automatic calculation
+        ], $opts);
+
+        if ( !is_numeric($opts['keyMaxWidth']) ) {
+            $opts['keyMaxWidth'] = self::getKeyMaxWidth($data);
+        }
+
+        $keyStyle = trim($opts['keyStyle']);
+
         foreach ($data as $key => $value) {
-            $text .= $leftChar;
+            $text .= $opts['leftChar'];
 
-            if ($keyMaxWidth) {
-                $text .= str_pad($key, $keyMaxWidth, ' ') . $sepChar;
+            if ($opts['keyMaxWidth']) {
+                $key = str_pad($key, $opts['keyMaxWidth'], ' ');
+                $text .= ( $keyStyle ? "<{$keyStyle}>$key</{$keyStyle}> " : $key ) . $opts['sepChar'];
             }
 
             $text .= "$value\n";

src/console/Interact.php

@@ -305,39 +305,49 @@ public static function section($msg, $width = 50, $char = '-')
      * ]
      * @param  array  $examples The command usage example. e.g 'php server.php {start|reload|restart|stop} [-d]'
      * @param  string $description The description text. e.g 'Composer version 1.3.2'
+     * @param  bool   $showAfterQuit Show help after quit
      */
-    public static function consoleHelp($usage, $commands = [], $options = [], $examples = [], $description = '')
+    public static function consoleHelp($usage, $commands = [], $options = [], $examples = [], $description = '', $showAfterQuit = true)
     {
-        self::helpPanel($usage, $commands, $options, $examples, $description);
+        self::helpPanel($usage, $commands, $options, $examples, $description, $showAfterQuit);
     }
-    public static function helpPanel($usage, $commands = [], $options = [], $examples = [], $description = '')
+    public static function helpPanel($usage, $commands = [], $options = [], $examples = [], $description = '', $showAfterQuit = true)
     {
+        // description
+        if ( $description ) {
+            self::write($description . PHP_EOL);
+        }
+
         // usage
         self::write("<comment>Usage</comment>:\n  {$usage}\n");
 
         // options list
         if ( $options ) {
             // translate array to string
             if ( is_array($options)) {
-                $optionMaxWidth = ConsoleHelper::keyMaxWidth($options);
-                $options = ConsoleHelper::spliceKeyValue($options, $optionMaxWidth);
+                $options = ConsoleHelper::spliceKeyValue($options, [
+                    'leftChar' => '  ',
+                    'keyStyle' => 'info',
+                ]);
             }
 
             if ( is_string($options) ) {
-                self::write("<comment>Options</comment>:\n  {$options}\n");
+                self::write("<comment>Options</comment>:\n{$options}");
             }
         }
 
         // command list
         if ( $commands ) {
             // translate array to string
             if ( is_array($commands)) {
-                $commandMaxWidth = ConsoleHelper::keyMaxWidth($commands);
-                $commands = ConsoleHelper::spliceKeyValue($commands, $commandMaxWidth);
+                $commands = ConsoleHelper::spliceKeyValue($commands, [
+                    'leftChar' => '  ',
+                    'keyStyle' => 'info',
+                ]);
             }
 
             if ( is_string($commands) ) {
-                self::write("<comment>Commands</comment>:\n  {$commands}\n");
+                self::write("<comment>Commands</comment>:\n{$commands}");
             }
         }
 
@@ -346,6 +356,10 @@ public static function helpPanel($usage, $commands = [], $options = [], $example
             $examples = is_array($examples) ? implode(PHP_EOL, $examples) : $examples;
             self::write("<comment>Examples</comment>:\n  {$examples}\n");
         }
+
+        if ($showAfterQuit) {
+            exit(0);
+        }
     }
 
     /**
@@ -418,7 +432,11 @@ public static function panel($data, $title='Information Panel', $char = '*')
         self::write('  ' . $border);
 
         // output panel body
-        $panelStr = ConsoleHelper::spliceKeyValue($panelData, $labelMaxWidth, ' | ', "  $char ");
+        $panelStr = ConsoleHelper::spliceKeyValue($panelData, [
+            'leftChar'    => "  $char ",
+            'sepChar'     => ' | ',
+            'keyMaxWidth' => $labelMaxWidth,
+        ]);
 
         // already exists "\n"
         self::write($panelStr, false);

src/console/Output.php

@@ -57,9 +57,9 @@ public function section($msg, $width = null)
      * helpPanel
      * @see Interact::helpPanel()
      */
-    public function helpPanel($usage, $commands = [], $options = [], $examples = [], $description = '')
+    public function helpPanel($usage, $commands = [], $options = [], $examples = [], $description = '', $showAfterQuit = true)
     {
-        Interact::helpPanel($msg, $width);
+        Interact::helpPanel($usage, $commands, $options, $examples, $description, $showAfterQuit);
     }
 
     /**