kristuff / mishell

demo/demo.askint.php

Indentation +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 Console::log("   - The method returns " . Console::text("int", 'blue') . " value or " .  Console::text("false", 'blue'). " if the entered value is not a valid int number.");
 Console::log("   - You can customize colors (foreground and background) and some styles in same way than ");
 Console::log('     with ' . Console::text("Console::text()", 'lightblue', 'underlined') . 
-                 ' and ' .  Console::text("Console::log()", 'lightblue', 'underlined'). ' methods.');
+                    ' and ' .  Console::text("Console::log()", 'lightblue', 'underlined'). ' methods.');
 Console::log();
 Console::log(' '. Console::text('Usage:', 'underlined', 'bold'));
 Console::log('   ' . Console::text("\$value = Console::askInt('Please enter a number > ');", 'lightmagenta')); 

Spacing +14 added lines, -14 removed lines

@@ -1,29 +1,29 @@
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
-Console::log(' '. Console::text('Overview:', 'underlined', 'bold'));
-Console::log("  - Use " . Console::text("int|bool ", 'blue') . Console::text("Console::askInt()", 'lightblue', 'underlined') . " to ask user to enter a number in the console.");
+Console::log(' '.Console::text('Overview:', 'underlined', 'bold'));
+Console::log("  - Use ".Console::text("int|bool ", 'blue').Console::text("Console::askInt()", 'lightblue', 'underlined')." to ask user to enter a number in the console.");
 Console::log();
-Console::log(' '. Console::text('Tips:', 'underlined', 'bold'));
-Console::log("   - The method returns " . Console::text("int", 'blue') . " value or " .  Console::text("false", 'blue'). " if the entered value is not a valid int number.");
+Console::log(' '.Console::text('Tips:', 'underlined', 'bold'));
+Console::log("   - The method returns ".Console::text("int", 'blue')." value or ".Console::text("false", 'blue')." if the entered value is not a valid int number.");
 Console::log("   - You can customize colors (foreground and background) and some styles in same way than ");
-Console::log('     with ' . Console::text("Console::text()", 'lightblue', 'underlined') . 
-                 ' and ' .  Console::text("Console::log()", 'lightblue', 'underlined'). ' methods.');
+Console::log('     with '.Console::text("Console::text()", 'lightblue', 'underlined'). 
+                 ' and '.Console::text("Console::log()", 'lightblue', 'underlined').' methods.');
 Console::log();
-Console::log(' '. Console::text('Usage:', 'underlined', 'bold'));
-Console::log('   ' . Console::text("\$value = Console::askInt('Please enter a number > ');", 'lightmagenta')); 
-Console::log('   ' . Console::text("if (\$value !== false) {", 'lightmagenta')); 
-Console::log('   ' . Console::text("// Do something with \$value", 'green')); 
+Console::log(' '.Console::text('Usage:', 'underlined', 'bold'));
+Console::log('   '.Console::text("\$value = Console::askInt('Please enter a number > ');", 'lightmagenta')); 
+Console::log('   '.Console::text("if (\$value !== false) {", 'lightmagenta')); 
+Console::log('   '.Console::text("// Do something with \$value", 'green')); 
 Console::log();
-Console::log(' '. Console::text('Sample:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Sample:', 'underlined', 'bold'));
 
 // -----------------
 // sample start here
 // -----------------
 $value = Console::askInt('  Please enter a number > ');
-if ($value !== false){
-    Console::log('  => The value you entered is [' . Console::text($value, 'yellow') . ']');
+if ($value !== false) {
+    Console::log('  => The value you entered is ['.Console::text($value, 'yellow').']');
 } else {
     Console::log(Console::text('  Error:', 'red'));
     Console::log(Console::text('  => the value you entered is not a valid number.', 'red'));

demo/demo.bell.php

Spacing +7 added lines, -7 removed lines

@@ -1,16 +1,16 @@
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
-Console::log(' '. Console::text('Overview:', 'underlined', 'bold'));
-Console::log('  - Use ' . Console::text("Console::bell()", 'lightblue', 'underlined') . ' to play a bell sound in console (if available).', 'white');
+Console::log(' '.Console::text('Overview:', 'underlined', 'bold'));
+Console::log('  - Use '.Console::text("Console::bell()", 'lightblue', 'underlined').' to play a bell sound in console (if available).', 'white');
 Console::log();   
-Console::log(' '. Console::text('Usage:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Usage:', 'underlined', 'bold'));
 Console::log();   
-Console::log('   ' .Console::text('// Play the bell', 'green'));
-Console::log('   ' .Console::text('Console::bell();', 'lightmagenta'));
+Console::log('   '.Console::text('// Play the bell', 'green'));
+Console::log('   '.Console::text('Console::bell();', 'lightmagenta'));
 Console::log();   
-Console::log(' '. Console::text('Sample:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Sample:', 'underlined', 'bold'));
 
 // -----------------
 // sample start here

demo/demo.bluescreen.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 // *open* new window
@@ -10,16 +10,16 @@ 
 $cols = Console::getColumns();
 $middle = round($lines/2);
 
-for ($i= 0; $i <= $lines ; $i++){
+for ($i = 0; $i <= $lines; $i++) {
 
-    switch($i){
-        case $middle -1:
+    switch ($i) {
+        case $middle-1:
             Console::log(Console::pad(":(   Houston, we've had a problem...", $cols, ' ', STR_PAD_BOTH), 'white', 'blue');
             break;
         case $middle :
             Console::log(Console::pad('an error occurred in my head,', $cols, ' ', STR_PAD_BOTH), 'white', 'blue');
             break;
-        case $middle +1:
+        case $middle+1:
             Console::log(Console::pad('I really want you to see the blue screen of the death', $cols, ' ', STR_PAD_BOTH), 'white', 'blue');
             break;
         default:

demo/demo.colors.php

Indentation +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 $i = 1;
 foreach (Console::getStyles()['foregrounds'] as $color => $colorValue ){
     Console::log('  '.Console::tableRow([
-       ' ' . $i     => 7,
+        ' ' . $i     => 7,
         $color        => 15, 
-       "\\033[" . $colorValue  .'m'  => 15, 
+        "\\033[" . $colorValue  .'m'  => 15, 
         Console::text(str_pad('I am a text color={' . $color .'}', 48), $color) => 50
     ]));
     $i++;

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 // headers
@@ -10,12 +10,12 @@ 
 
 // loop into foregrounds
 $i = 1;
-foreach (Console::getStyles()['foregrounds'] as $color => $colorValue ){
+foreach (Console::getStyles()['foregrounds'] as $color => $colorValue) {
     Console::log('  '.Console::tableRow([
-       ' ' . $i     => 7,
+       ' '.$i     => 7,
         $color        => 15, 
-       "\\033[" . $colorValue  .'m'  => 15, 
-        Console::text(str_pad('I am a text color={' . $color .'}', 48), $color) => 50
+       "\\033[".$colorValue.'m'  => 15, 
+        Console::text(str_pad('I am a text color={'.$color.'}', 48), $color) => 50
     ]));
     $i++;
 }

demo/demo.table.php

Indentation +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 Console::$horizontalSeparator = '-';            // change the horizontal separator
 Console::$tableCellPadding = '';                // no padding 
 Console::$verticalInnerSeparator = '   ';       // blank separator
-     Console::$verticalSeparator = '   ';       // no top left/right separator except a margin..
+        Console::$verticalSeparator = '   ';       // no top left/right separator except a margin..
 // Console::$verticalHeaderSeparator = '';      // no top left/right separator (not needed)
 
 // table start

Spacing +37 added lines, -37 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 console::resetDefaults();
 
-Console::log(' ' . Console::text('Basic sample', 'white', 'underlined'));
+Console::log(' '.Console::text('Basic sample', 'white', 'underlined'));
 Console::log();
 
 $rowHeaders = ['Index' => 10, 'Item'  => 25, 'Description' => 50];
 $rows = [
-    ['foo',       'some text for foo'],
-    ['bar',       'some text for bar'],
-    ['foobar',    'some text for foobar']
+    ['foo', 'some text for foo'],
+    ['bar', 'some text for bar'],
+    ['foobar', 'some text for foobar']
 ];
 Console::log(Console::tableSeparator($rowHeaders));
 Console::log(Console::tableRow($rowHeaders));
 Console::log(Console::tableRowSeparator($rowHeaders));
 
-foreach ($rows as $key => $value){
+foreach ($rows as $key => $value) {
     Console::log(Console::tableRow([
         $key            => 10, 
         $rows[$key][0]  => 25, 
@@ -34,7 +34,7 @@ 
 // -------------------------------
 // ------ ADVANCED SAMPLE --------
 // -------------------------------
-Console::log(' ' . Console::text('Advanced sample', 'white', 'underlined'));
+Console::log(' '.Console::text('Advanced sample', 'white', 'underlined'));
 Console::log();
 
 $rowHeaders = [
@@ -44,16 +44,16 @@ 
 ];
 $rows = [
     [
-        Console::text('foo',   'white'),     
+        Console::text('foo', 'white'),     
         Console::text('some centered text red for foo', 'red')
     ],
     [
-        Console::text('bar',   'white'),     
-        Console::text( 'some centered text green for bar', 'green')
+        Console::text('bar', 'white'),     
+        Console::text('some centered text green for bar', 'green')
     ],
     [
         Console::text('foobar', 'white'),    
-        'some text with unicode ✓ ' .Console::text('on BLUE here', 'white', 'blue')  
+        'some text with unicode ✓ '.Console::text('on BLUE here', 'white', 'blue')  
     ]
 ];
 
@@ -66,24 +66,24 @@ 
 Console::$tableCellPadding = '  '; // increase cell padding to 2 white chars (default is 1)
 
 // table start
-Console::log(Console::tableSeparator($rowHeaders));    // top line             |-----------------------  ...
-Console::log(Console::tableRow($rowHeaders));          // columns headers      | foo     | bar     |---  ...
+Console::log(Console::tableSeparator($rowHeaders)); // top line             |-----------------------  ...
+Console::log(Console::tableRow($rowHeaders)); // columns headers      | foo     | bar     |---  ...
 Console::log(Console::tableRowSeparator($rowHeaders)); // saparator            |---------|---------|---  ...
-Console::log(Console::tableRowEmpty($rowHeaders));     // empty row            |         |         |     ...
+Console::log(Console::tableRowEmpty($rowHeaders)); // empty row            |         |         |     ...
 
 // tables rows
-foreach ($rows as $key => $value){
+foreach ($rows as $key => $value) {
 
     Console::log(
-        Console::TableRowStart().    // start row with separator. Then, each cell will end with a separator 
-        Console::TableRowCell($key, 10).                                   //no align => default is left
-        Console::TableRowCell($rows[$key][0] , 25, Console::ALIGN_RIGHT).  //set align right
-        Console::TableRowCell($rows[$key][1] , 50, Console::ALIGN_CENTER)  //set align center
+        Console::TableRowStart().// start row with separator. Then, each cell will end with a separator 
+        Console::TableRowCell($key, 10).//no align => default is left
+        Console::TableRowCell($rows[$key][0], 25, Console::ALIGN_RIGHT).//set align right
+        Console::TableRowCell($rows[$key][1], 50, Console::ALIGN_CENTER)  //set align center
     );
 }
 
 // table end
-Console::log(Console::tableRowEmpty($rowHeaders));     // empty row            |         |         |     ...
+Console::log(Console::tableRowEmpty($rowHeaders)); // empty row            |         |         |     ...
 Console::log(Console::tableSeparator($rowHeaders)); // saparator               |-----------------------  ...
 console::resetDefaults();
 
@@ -91,38 +91,38 @@ 
 // ------ ANOTHER STYLE  ---------
 // -------------------------------
 Console::log();
-Console::log(' ' . Console::text('Another style sample', 'white', 'underlined'));
+Console::log(' '.Console::text('Another style sample', 'white', 'underlined'));
 Console::log();
 
 $rowHeaders = [
-    Console::text('Item',           'darkgray')    => 10, 
-    Console::text('Status',         'darkgray')    => 12,
-    Console::text('Description',    'darkgray')    => 25
+    Console::text('Item', 'darkgray')    => 10, 
+    Console::text('Status', 'darkgray')    => 12,
+    Console::text('Description', 'darkgray')    => 25
 ];
 $rows = [
-    [Console::text('foo',     'white'), Console::text(' ONLINE ',  'white', 'green') , Console::text('some text for foo',    'white')],
-    [Console::text('bar',     'white'), Console::text(' ONLINE ',  'white', 'green') , Console::text('some text for bar',    'white')],
-    [Console::text('foobar ', 'white'), Console::text(' OFFLINE ', 'white', 'red')   , Console::text('some text for foobar', 'white')]
+    [Console::text('foo', 'white'), Console::text(' ONLINE ', 'white', 'green'), Console::text('some text for foo', 'white')],
+    [Console::text('bar', 'white'), Console::text(' ONLINE ', 'white', 'green'), Console::text('some text for bar', 'white')],
+    [Console::text('foobar ', 'white'), Console::text(' OFFLINE ', 'white', 'red'), Console::text('some text for foobar', 'white')]
 ];
 
-Console::$horizontalSeparator = '-';            // change the horizontal separator
-Console::$tableCellPadding = '';                // no padding 
-Console::$verticalInnerSeparator = '   ';       // blank separator
-     Console::$verticalSeparator = '   ';       // no top left/right separator except a margin..
+Console::$horizontalSeparator = '-'; // change the horizontal separator
+Console::$tableCellPadding = ''; // no padding 
+Console::$verticalInnerSeparator = '   '; // blank separator
+     Console::$verticalSeparator = '   '; // no top left/right separator except a margin..
 // Console::$verticalHeaderSeparator = '';      // no top left/right separator (not needed)
 
 // table start
 Console::log(Console::tableRowSeparator($rowHeaders, 'drakgray')); // saparator            ---------   ---------   ---  
-Console::log(Console::tableRow($rowHeaders, 'drakgray'));          // columns headers      foo         bar         f... 
+Console::log(Console::tableRow($rowHeaders, 'drakgray')); // columns headers      foo         bar         f... 
 Console::log(Console::tableRowSeparator($rowHeaders, 'drakgray')); // saparator            ---------   ---------   ---  
 
 // tables rows
-foreach ($rows as $row){
+foreach ($rows as $row) {
     Console::log(
-        Console::TableRowStart().           // start row with separator. Then, each cell will end with a separator 
-        Console::TableRowCell($row[0] , 10).   // keep align right left
-        Console::TableRowCell($row[1] , 12, Console::ALIGN_CENTER).  // align center
-        Console::TableRowCell($row[2] , 25)  // keep align right left
+        Console::TableRowStart().// start row with separator. Then, each cell will end with a separator 
+        Console::TableRowCell($row[0], 10).// keep align right left
+        Console::TableRowCell($row[1], 12, Console::ALIGN_CENTER).// align center
+        Console::TableRowCell($row[2], 25)  // keep align right left
     );
 }
 // table end

lib/ShellColoredPrinter.php

Spacing +33 added lines, -33 removed lines

@@ -37,7 +37,7 @@ 
         'magenta'      => '35', 
         'cyan'         => '36', 
         'lightgray'    => '37', 
-        'default'      => '39',   // your default color
+        'default'      => '39', // your default color
         'darkgray'     => '90',
         'lightred'     => '91',
         'lightgreen'   => '92',
@@ -83,12 +83,12 @@ 
      * @var    array
      */
     protected static $options = array(
-        'none'         => '0',    // reset all styles
-        'bold'         => '1',    // 
+        'none'         => '0', // reset all styles
+        'bold'         => '1', // 
         'dim'          => '2',
         'underlined'   => '4',    
         'blink'        => '5', 
-        'reverse'      => '7',    // reverse foreground/background color
+        'reverse'      => '7', // reverse foreground/background color
 
         //formats=(["bold"]=1 ["bright"]=1 ["dim"]=2 ["underlined"]=4 ["blink"]=5 ["reverse"]=7 ["hidden"]=8)
         //resets=(["all"]=0 ["bold"]=21 ["bright"]=21 ["dim"]=22 ["underlined"]=24 ["blink"]=25 ["reverse"]=27 ["hidden"]=28)
@@ -130,27 +130,27 @@ 
         array_shift($args);
 
         // 
-        switch($command){
+        switch ($command) {
 
             // ****************************************
             // Get methods (return string)
             // ****************************************
 
             case'text':
-                return self::getCliString($str, $args);             // get formatted text
+                return self::getCliString($str, $args); // get formatted text
             
             // ****************************************
             // Print methods (echo and return null)
             // ****************************************
             
             case'print':
-                echo (self::getCliString($str, $args));               // print text
+                echo (self::getCliString($str, $args)); // print text
                 break;
             case'log':
-                echo (self::getCliString($str, $args) . self::$EOF );   // print text + newline
+                echo (self::getCliString($str, $args).self::$EOF); // print text + newline
                 break;
             case'relog':
-                echo (self::getCliString($str ."\r", $args));         // overwrite current line 
+                echo (self::getCliString($str."\r", $args)); // overwrite current line 
                 break;
 
             // *****************************************
@@ -158,19 +158,19 @@ 
             // *****************************************
 
             case'ask':
-                echo (self::getCliString($str, $args));     // print question
-                return trim(fgets(STDIN));                  // reads and return one line from STDIN 
+                echo (self::getCliString($str, $args)); // print question
+                return trim(fgets(STDIN)); // reads and return one line from STDIN 
            
             case'askPassword':
-                self::hideInput();                          // hide 
-                echo (self::getCliString($str, $args));     // print question
-                $line= trim(fgets(STDIN));                  // reads one line from STDIN 
-                self::restoreInput();                       // restore 
-                return $line;                               // return line
+                self::hideInput(); // hide 
+                echo (self::getCliString($str, $args)); // print question
+                $line = trim(fgets(STDIN)); // reads one line from STDIN 
+                self::restoreInput(); // restore 
+                return $line; // return line
                 
             case 'askInt':
-                echo (self::getCliString($str, $args));     // print question
-                fscanf(STDIN, "%d\n", $number);             // reads number from STDIN
+                echo (self::getCliString($str, $args)); // print question
+                fscanf(STDIN, "%d\n", $number); // reads number from STDIN
                 return (is_int($number) ? $number : false); // return int value or false
         }
 
@@ -190,7 +190,7 @@ 
      */
     protected static function getCliString(string $str, array $arguments = [])
     {
-        if (empty($arguments)){
+        if (empty($arguments)) {
             return $str;
         }
 
@@ -203,25 +203,25 @@ 
         foreach ($arguments as $argument) {
             
             // it's a color?
-            if(!$hasColor && isset(self::$foregroundColors[$argument])){
+            if (!$hasColor && isset(self::$foregroundColors[$argument])) {
                 $cliArgs[] = self::$foregroundColors[$argument];
                 $hasColor = true;
 
             // it's a backcolor?
-            } elseif ($hasColor && !$hasBackColor && isset(self::$backgroundColors[$argument])){
+            } elseif ($hasColor && !$hasBackColor && isset(self::$backgroundColors[$argument])) {
                 $cliArgs[] = self::$backgroundColors[$argument];
                 $hasBackColor = true;
 
             // or it's an option?
-            } elseif (isset(self::$options[$argument])){
+            } elseif (isset(self::$options[$argument])) {
                 $cliArgs[] = self::$options[$argument];
             }
         }
 
         // Add string and end coloring
         // todo \e[0m 
-        $coloredString .= "\033[" . implode(';',$cliArgs) .'m';
-        $coloredString .=  $str . "\033[0m";
+        $coloredString .= "\033[".implode(';', $cliArgs).'m';
+        $coloredString .= $str."\033[0m";
         return $coloredString;
     }
 
@@ -305,7 +305,7 @@ 
      */
     public static function askPassword()
     {
-        return self::cmd('askPassword',func_get_args());
+        return self::cmd('askPassword', func_get_args());
     }
 
     /**
@@ -322,7 +322,7 @@ 
      */
     public static function log()
     {
-        self::cmd('log',func_get_args());
+        self::cmd('log', func_get_args());
     }
 
     /**
@@ -339,7 +339,7 @@ 
      */
     public static function relog()
     {
-        self::cmd('relog',func_get_args());
+        self::cmd('relog', func_get_args());
     }  
        
     /**
@@ -356,20 +356,20 @@ 
      */    
     public static function pad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)
     {
-        $diff = $padLength - mb_strlen(preg_replace('#\\033\[[[0-9;*]{1,}m#', '', $input));
+        $diff = $padLength-mb_strlen(preg_replace('#\\033\[[[0-9;*]{1,}m#', '', $input));
         
-        if ($diff > 0){
-            switch ($padType){
+        if ($diff > 0) {
+            switch ($padType) {
                 
                 case STR_PAD_RIGHT:
-                    return $input . str_repeat($padString, $diff);
+                    return $input.str_repeat($padString, $diff);
                 
                 case STR_PAD_LEFT:
-                    return str_repeat($padString, $diff ) . $input;
+                    return str_repeat($padString, $diff).$input;
                 
                 case STR_PAD_BOTH:
                     $padLeft = round(($diff)/2);
-                    return str_repeat($padString, $padLeft) . $input . str_repeat($padString, $diff - $padLeft);
+                    return str_repeat($padString, $padLeft).$input.str_repeat($padString, $diff-$padLeft);
             }
         }
         return $input;

lib/ShellTablePrinter.php

Indentation +8 added lines, -8 removed lines

@@ -58,12 +58,12 @@ 
      */
     protected static $defaultVerticalSign = '|';
 
-     /**
-     * The default vertical sign. 
-     *
-     * @access protected
-     * @var    string
-     */
+        /**
+         * The default vertical sign. 
+         *
+         * @access protected
+         * @var    string
+         */
     protected static $defaultVerticalInnerSign = '+';
 
     /**
@@ -106,7 +106,7 @@ 
      */
     public static $verticalHeaderSeparator   = '+';
 
-   /**
+    /**
      * The vertical separator sign. 
      *
      * @access public
@@ -257,7 +257,7 @@ 
      *
      * @return string          
      */
-     public static function tableRow()
+        public static function tableRow()
     {
         // get and parse arguments:
         //  - extract first argument (columns list)

Spacing +19 added lines, -19 removed lines

@@ -80,7 +80,7 @@ 
      * @access public
      * @var    string
      */
-    public static $tableCellPadding    = ' ';
+    public static $tableCellPadding = ' ';
 
     /**
      * The horizontal separator sign. 
@@ -96,7 +96,7 @@ 
      * @access public
      * @var    string
      */
-    public static $verticalSeparator   = '|';
+    public static $verticalSeparator = '|';
 
     /**
      * The vertical header separator sign. 
@@ -104,7 +104,7 @@ 
      * @access public
      * @var    string
      */
-    public static $verticalHeaderSeparator   = '+';
+    public static $verticalHeaderSeparator = '+';
 
    /**
      * The vertical separator sign. 
@@ -112,7 +112,7 @@ 
      * @access public
      * @var    string
      */
-    public static $verticalInnerSeparator   = '+';
+    public static $verticalInnerSeparator = '+';
            
     /**
      * Resets the default options
@@ -148,13 +148,13 @@ 
         $columnsPads = !empty($args) ? $args[0] : [];
         array_shift($args);
 
-        $str = self::$verticalSeparator ;
-        $cellPaddingLenght = mb_strlen(self::$tableCellPadding) *2;
-        foreach ($columnsPads as $key => $pad){
-            $str .= str_repeat(self::$horizontalSeparator , $pad + $cellPaddingLenght) .self::$verticalInnerSeparator;
+        $str = self::$verticalSeparator;
+        $cellPaddingLenght = mb_strlen(self::$tableCellPadding)*2;
+        foreach ($columnsPads as $key => $pad) {
+            $str .= str_repeat(self::$horizontalSeparator, $pad+$cellPaddingLenght).self::$verticalInnerSeparator;
         }
 
-        return self::getCliString(self::$verticalInnerSeparator === '' ? $str : substr($str, 0, mb_strlen($str) -1). self::$verticalSeparator, $args);
+        return self::getCliString(self::$verticalInnerSeparator === '' ? $str : substr($str, 0, mb_strlen($str)-1).self::$verticalSeparator, $args);
     }
 
     /**
@@ -174,12 +174,12 @@ 
         $columnsPads = !empty($args) ? $args[0] : [];
         array_shift($args);
 
-        $str = self::$verticalHeaderSeparator ;
-        $cellPaddingLenght = mb_strlen(self::$tableCellPadding) *2;
-        foreach ($columnsPads as $key => $pad){
-            $str .= str_repeat(self::$horizontalSeparator , $pad + $cellPaddingLenght) .self::$verticalInnerSeparator ;
+        $str = self::$verticalHeaderSeparator;
+        $cellPaddingLenght = mb_strlen(self::$tableCellPadding)*2;
+        foreach ($columnsPads as $key => $pad) {
+            $str .= str_repeat(self::$horizontalSeparator, $pad+$cellPaddingLenght).self::$verticalInnerSeparator;
         }
-        return self::getCliString(self::$verticalInnerSeparator === '' ? $str : substr($str, 0, mb_strlen($str) -1). self::$verticalHeaderSeparator, $args);
+        return self::getCliString(self::$verticalInnerSeparator === '' ? $str : substr($str, 0, mb_strlen($str)-1).self::$verticalHeaderSeparator, $args);
 
     }
 
@@ -203,12 +203,12 @@ 
         $columnsPads = !empty($args) ? $args[0] : [];
         array_shift($args);
 
-        $str = self::$verticalSeparator ;
-        foreach ($columnsPads as $pad){
+        $str = self::$verticalSeparator;
+        foreach ($columnsPads as $pad) {
             $str .= self::$tableCellPadding. 
                     str_pad(' ', $pad).
                     self::$tableCellPadding. 
-                    self::$verticalSeparator ;
+                    self::$verticalSeparator;
         }
         return self::getCliString($str, $args);
     }
@@ -271,7 +271,7 @@ 
         $str = self::$verticalSeparator;
 
         // add columns        
-        foreach ($columns as $column => $pad){
+        foreach ($columns as $column => $pad) {
             $str .= self::$tableCellPadding. 
                     self::pad($column, $pad).
                     self::$tableCellPadding.
@@ -279,6 +279,6 @@ 
         }
 
         // format full row
-        return self::getCliString($str, $args) ; 
+        return self::getCliString($str, $args); 
     }
 }
\ No newline at end of file

lib/Program.php

Indentation +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
      */
     public static function inArguments(array $arguments, string $shortArg, string $longArg)
     {
-          return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
+            return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     public static function getArgumentValue(array $arguments, string $shortArg, string $longArg):? string
     {
-          return array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
+            return array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
                  (array_key_exists($longArg, $arguments) ? $arguments[$longArg]  : null);
     }
 

Spacing +2 added lines, -3 removed lines

@@ -63,10 +63,9 @@
      * @return string|null   
      * 
      */
-    public static function getArgumentValue(array $arguments, string $shortArg, string $longArg):? string
+    public static function getArgumentValue(array $arguments, string $shortArg, string $longArg): ? string
     {
-          return array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
-                 (array_key_exists($longArg, $arguments) ? $arguments[$longArg]  : null);
+          return array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : (array_key_exists($longArg, $arguments) ? $arguments[$longArg] : null);
     }
 
 }
\ No newline at end of file