update, bug fixed for console/Interact

Author: inhere

src/console/ConsoleHelper.php

@@ -75,10 +75,10 @@ public static function keyMaxWidth(array $data, $expactInt = true)
      * @param  string $leftChar e.g ' * '
      * @return string
      */
-    public static function spliceKeyValue($data, $keyMaxWidth, $sepChar = ' ', $leftChar='')
+    public static function spliceKeyValue(array $data, $keyMaxWidth, $sepChar = ' ', $leftChar='')
     {
         $text = '';
-        foreach ($panelData as $key => $value) {
+        foreach ($data as $key => $value) {
             $text .= $leftChar;
 
             if ($keyMaxWidth) {

src/console/Interact.php

@@ -354,7 +354,7 @@ public static function helpPanel($usage, $commands = [], $options = [], $example
      * @param  string $title
      * @return void
      */
-    public static function panel($data, $title='Info panel', $char = '*')
+    public static function panel($data, $title='Information Panel', $char = '*')
     {
         $data = is_array($data) ? array_filter($data) : [trim($data)];
         $title = trim($title);
@@ -363,8 +363,6 @@ public static function panel($data, $title='Info panel', $char = '*')
         $labelMaxWidth = 0; // if label exists, label max width
         $valueMaxWidth = 0; // value max width
 
-        self::write("\n  " . sprintf(self::STAR_LINE,"<bold>$title</bold>"), false);
-
         foreach ($data as $label => $value) {
             // label exists
             if ( !is_numeric($label) ) {
@@ -377,11 +375,18 @@ public static function panel($data, $title='Info panel', $char = '*')
                 $temp = '';
 
                 foreach ($value as $key => $val) {
-                    $val = (string)$val;
-                    $temp .= (!is_numeric($key) ? "$key: " : '') . "<info>$value</info>, ";
+                    if (is_bool($val)) {
+                        $val = $val ? 'True' : 'False';
+                    } else {
+                        $val = (string)$val;
+                    }
+
+                    $temp .= (!is_numeric($key) ? "$key: " : '') . "<info>$val</info>, ";
                 }
 
                 $value = rtrim($temp, ' ,');
+            } else if (is_bool($value)) {
+                $value = $value ? 'True' : 'False';
             }
 
             // get value width
@@ -390,6 +395,7 @@ public static function panel($data, $title='Info panel', $char = '*')
                 $width = mb_strlen(strip_tags($value), 'UTF-8'); // must clear style tag
                 $valueMaxWidth = $width > $valueMaxWidth ? $width : $valueMaxWidth;
             } else {
+                de((string)$value);
                 throw new \Exception('Panel data value only allow [array|string|number]');
             }
 
@@ -402,12 +408,13 @@ public static function panel($data, $title='Info panel', $char = '*')
         if ($title) {
             $title = ucwords($title);
             $titleLength = mb_strlen($title, 'UTF-8');
+            $panelWidth = $panelWidth > $titleLength ? $panelWidth : $titleLength;
             $indentSpace = str_pad(' ', ceil($panelWidth/2) - ceil($titleLength/2) + 2*2, ' ');
             self::write("  {$indentSpace}<bold>{$title}</bold>");
         }
 
         // output panel top border
-        $border = str_pad($char, $panelWidth + (2*3), $char);
+        $border = str_pad($char, $panelWidth + (3*3), $char);
         self::write('  ' . $border);
 
         // output panel body