kristuff / mishell

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 formated text
+                return self::getCliString($str, $args); // get formated 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 function pad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)
     {
-        $diff = $padLength - strlen(preg_replace('#\\033\[[[0-9;*]{1,}m#', '', $input));
+        $diff = $padLength-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/Program.php

Indentation +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      */
     protected 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,11 +65,11 @@ 
      */
     protected static function getArgumentValue(array $arguments, string $shortArg, string $longArg)
     {
-          $val = array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
+            $val = array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
                  (array_key_exists($longArg, $arguments) ? $arguments[$longArg]  : null);
           
           
-          return $val;
+            return $val;
 
     }
 

Spacing +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
      */
     protected static function getArgumentValue(array $arguments, string $shortArg, string $longArg)
     {
-          $val = array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
-                 (array_key_exists($longArg, $arguments) ? $arguments[$longArg]  : null);
+          $val = array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : (array_key_exists($longArg, $arguments) ? $arguments[$longArg] : null);
           
           
           return $val;

demo/demo.table.php

Spacing +20 added lines, -20 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 (on right)',   'white'),     
+        Console::text('foo (on right)', 'white'),     
         Console::text('some centered text red for foo', 'red')
     ],
     [
-        Console::text('bar (on right)',   'white'),     
-        Console::text( 'some centered text green for bar', 'green')
+        Console::text('bar (on right)', 'white'),     
+        Console::text('some centered text green for bar', 'green')
     ],
     [
         Console::text('foobar (on right)', 'white'),    
-        'some centered text ' .Console::text('on BLUE here', 'white', 'blue'). ' for foobar' 
+        'some centered text '.Console::text('on BLUE here', 'white', 'blue').' for foobar' 
     ]
 ];
 
@@ -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();
 

demo/demo.size.php

Spacing +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@ 
 <?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 ", 'blue'). Console::text("Console::getLines()", 'lightblue', 'underlined') . " get the number of lines in terminal.");
-Console::log("  - Use " .  Console::text("int ", 'blue'). Console::text("Console::getColumns()", 'lightblue', 'underlined') . " get the number of columns in terminal.");
+Console::log(' '.Console::text('Overview:', 'underlined', 'bold'));
+Console::log("  - Use ".Console::text("int ", 'blue').Console::text("Console::getLines()", 'lightblue', 'underlined')." get the number of lines in terminal.");
+Console::log("  - Use ".Console::text("int ", 'blue').Console::text("Console::getColumns()", 'lightblue', 'underlined')." get the number of columns in terminal.");
 Console::log();   
 Console::log();   
-Console::log(' '. Console::text('Sample:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Sample:', 'underlined', 'bold'));
 Console::log();   
 
 // get columns and lines 
@@ -15,8 +15,8 @@ 
 $cols  = Console::getColumns();
 
 // print value
-Console::log('  The number of lines is currently: ' .Console::text($lines, 'green'));
-Console::log('  The number of columns is currently: ' .Console::text($cols, 'green'));
+Console::log('  The number of lines is currently: '.Console::text($lines, 'green'));
+Console::log('  The number of columns is currently: '.Console::text($cols, 'green'));
 Console::log();   
 
 // build a 'full' row

demo/demo.pad.php

Spacing +9 added lines, -9 removed lines

@@ -1,30 +1,30 @@
 <?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("string ", 'blue'). Console::text("Console::pad()", 'lightblue', 'underlined') . "to get a text with given padding.");
-Console::log("  - The method is equivalent to php " . Console::text("str_pad()", 'lightblue', 'underlined'). " method, except that it handles not printable ANSI chars.");
+Console::log(' '.Console::text('Overview:', 'underlined', 'bold'));
+Console::log("  - Use ".Console::text("string ", 'blue').Console::text("Console::pad()", 'lightblue', 'underlined')."to get a text with given padding.");
+Console::log("  - The method is equivalent to php ".Console::text("str_pad()", 'lightblue', 'underlined')." method, except that it handles not printable ANSI chars.");
 Console::log();   
-Console::log(' '. Console::text('Sample:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Sample:', 'underlined', 'bold'));
 
 // -----------------
 // sample start here
 // -----------------
 Console::log();     
-Console::log(' '. Console::text(' 1) Using ') . Console::text('php str_pad()', 'lightblue', 'underlined')); 
+Console::log(' '.Console::text(' 1) Using ').Console::text('php str_pad()', 'lightblue', 'underlined')); 
 Console::log();     
 Console::log(str_pad(' I am normal inside str_pad() {padLength:100, padString:\'*\'}', 100, '*'));
 Console::log(str_pad(Console::text(' I am colorized with ::text() inside str_pad() {padLength:100, padString:\'*\'}', 'lightcyan'), 100, '*'));
 Console::log();     
-Console::log(' '. Console::text(' => you should\'see what you expect. I guess second text has less than 100 chars... ', 'white', 'red')); 
+Console::log(' '.Console::text(' => you should\'see what you expect. I guess second text has less than 100 chars... ', 'white', 'red')); 
 Console::log();     
 Console::log();     
-Console::log(' '. Console::text(' 2) Using ') . Console::text('Console::pad()', 'lightblue', 'underlined')); 
+Console::log(' '.Console::text(' 2) Using ').Console::text('Console::pad()', 'lightblue', 'underlined')); 
 Console::log();     
 Console::log(Console::pad('  I am normal inside ::pad() {padLength:100, padString:\'*\'}', 100, '*'));
 Console::log(Console::pad(Console::text('  I am colorized with ::text() inside ::pad() {padLength:100, padString:\'*\'}', 'lightcyan'), 100, '*'));
 Console::log();     
-Console::log(' '. Console::text(' => should be OK ', 'white', 'green'));
+Console::log(' '.Console::text(' => should be OK ', 'white', 'green'));
 
 ?>

demo/demo.progress.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 Console::log("   - you may need to use " . Console::text("php str_pad()", 'lightblue', 'underlined') . " method to be sure all previous text is overwitted.");
 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('Sample code:', 'underlined', 'bold'));
 Console::log();

Spacing +15 added lines, -15 removed lines

@@ -1,23 +1,23 @@ 
 <?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::relog()", 'lightblue', 'underlined') . " to overwrite the current line.", 'white');
+Console::log(' '.Console::text('Overview:', 'underlined', 'bold'));
+Console::log("  - Use ".Console::text("Console::relog()", 'lightblue', 'underlined')." to overwrite the current line.", 'white');
 Console::log();
 
-Console::log(' '. Console::text('Tips:', 'underlined', 'bold'));
-Console::log("   - you may need to use " . Console::text("php str_pad()", 'lightblue', 'underlined') . " method to be sure all previous text is overwitted.");
+Console::log(' '.Console::text('Tips:', 'underlined', 'bold'));
+Console::log("   - you may need to use ".Console::text("php str_pad()", 'lightblue', 'underlined')." method to be sure all previous text is overwitted.");
 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('Sample code:', 'underlined', 'bold'));
+Console::log(' '.Console::text('Sample code:', 'underlined', 'bold'));
 Console::log();
-Console::log('    '.Console::text(str_pad('// fake progress loop ', 100),'green'));
+Console::log('    '.Console::text(str_pad('// fake progress loop ', 100), 'green'));
 Console::log('    '.Console::text(str_pad('for ($i=0 ; $i<=10 ; $i++) {', 100), 'lightgray'));
-Console::log('    '.Console::text(str_pad('    // Overwrite progress message.',  100), 'green'));
-Console::log('    '.Console::text(str_pad("    Console::relog(' I am a progress text... ['.Console::text($\i, 'green') .']% completed');",  100),'lightgray'));
+Console::log('    '.Console::text(str_pad('    // Overwrite progress message.', 100), 'green'));
+Console::log('    '.Console::text(str_pad("    Console::relog(' I am a progress text... ['.Console::text($\i, 'green') .']% completed');", 100), 'lightgray'));
 Console::log('    '.Console::text(str_pad("    // wait for a while, so we see the animation ", 100), 'green'));
 Console::log('    '.Console::text(str_pad('    usleep(300000);', 100), 'lightgray'));
 Console::log('    '.Console::text(str_pad('}', 100), 'lightgray'));
@@ -34,16 +34,16 @@ 
 Console::log('    '.Console::text(str_pad("// note: you may need to use str_pad() method to be sure all previous text is overwritten", 100), 'green'));
 Console::log('    '.Console::text(str_pad("Console::relog(Console::text('Done!', 'white', 'green', 'underlined'). str_pad(' ', 100);", 100), 'lightgray'));
 Console::log();
-Console::log(' ' .'    '.Console::text('Sample result:', 'underlined', 'bold'));
+Console::log(' '.'    '.Console::text('Sample result:', 'underlined', 'bold'));
 // -----------------
 // sample start here
 // -----------------
 
 // fake progress message 
-for ($i=0 ; $i<=100 ; $i++) {
+for ($i = 0; $i <= 100; $i++) {
 
     // Overwrite progress message. 
-    Console::relog(' I am a progress text... ['.Console::text($i, 'green') .']% completed');
+    Console::relog(' I am a progress text... ['.Console::text($i, 'green').']% completed');
 
     // wait for a while, so we see the animation
     usleep(100000); 
@@ -59,7 +59,7 @@ 
 
 // Overwrite progress message. 
 // note: you may need to use str_pad() method to be sure all previous text is overwritten.
-Console::relog(Console::text(' Done!', 'white', 'green', 'underlined'). str_pad(' ', 100));
+Console::relog(Console::text(' Done!', 'white', 'green', 'underlined').str_pad(' ', 100));
 Console::log('');
 
 ?>

demo/demo.window.php

Spacing +8 added lines, -8 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 Console::log(' Let say we are current window.');
-Console::log(' We will open a new window using ' . Console::text('Console::newWindow()', 'lightblue', 'underlined') . ' method.');
+Console::log(' We will open a new window using '.Console::text('Console::newWindow()', 'lightblue', 'underlined').' method.');
 Console::ask(' Press [Enter] to open new window > ');
 
 // ------------------
@@ -17,7 +17,7 @@ 
 Console::log('          NEW WINDOW 1        ', 'green');
 Console::log(' _____________________________', 'green');
 Console::log();
-Console::log(' I am in new window. We will restore the window later using ' .  Console::text('Console::restoreWindow()', 'lightblue', 'underlined') . ' method.' );
+Console::log(' I am in new window. We will restore the window later using '.Console::text('Console::restoreWindow()', 'lightblue', 'underlined').' method.');
 Console::ask(' Press [Enter] to restore >');
 
 // ------------------
@@ -25,8 +25,8 @@ 
 // ------------------
 Console::restoreWindow();
 
-Console::log(' We have now restored the current window using ' . Console::text('Console::restoreWindow()', 'lightblue', 'underlined') . ' method');
-Console::log(' We will reopen a new window using ' . Console::text('Console::newWindow()', 'lightblue', 'underlined') . ' method.');
+Console::log(' We have now restored the current window using '.Console::text('Console::restoreWindow()', 'lightblue', 'underlined').' method');
+Console::log(' We will reopen a new window using '.Console::text('Console::newWindow()', 'lightblue', 'underlined').' method.');
 Console::ask(' Press [Enter] to open new window > ');
 
 // ------------------
@@ -40,14 +40,14 @@ 
 Console::log('          NEW WINDOW 2        ', 'yellow');
 Console::log(' _____________________________', 'yellow');
 Console::log();
-Console::log(' I am in new window. We will restore the window later using ' .  Console::text('Console::restoreWindow()', 'lightblue', 'underlined') . ' method.' );
+Console::log(' I am in new window. We will restore the window later using '.Console::text('Console::restoreWindow()', 'lightblue', 'underlined').' method.');
 Console::ask(' Press [Enter] to restore >');
 
 // ------------------
 // restore new window
 // ------------------
 Console::restoreWindow();
-Console::log(' We have now restored the current window using ' .  Console::text('Console::restoreWindow()', 'lightblue', 'underlined') . ' method. That\'s all.');
-Console::log(' Got it'. Console::text('?', 'green'));
+Console::log(' We have now restored the current window using '.Console::text('Console::restoreWindow()', 'lightblue', 'underlined').' method. That\'s all.');
+Console::log(' Got it'.Console::text('?', 'green'));
 
 ?>

demo/demo.bgcolors.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     $foregroundColor = ($bgcolor === 'black' || $bgcolor === 'default') ? 'white': 'black';
     Console::log('  '.Console::tableRow([
         $bgcolor        => 15, 
-       "\\033[" . $colorValue  .'m'  => 15, 
+        "\\033[" . $colorValue  .'m'  => 15, 
         Console::text(str_pad('I am a text color={' . $foregroundColor .'} on bgcolor={' . $bgcolor .'}', 48), $foregroundColor , $bgcolor) => 51
     ]));
     $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;
 
 $rowHeaders = ['Color name' => 15, ' ANSI Code'  => 15, ' Sample ouput' => 51];
@@ -9,12 +9,12 @@ 
 
 // enum backgrounds
 $i = 1;
-foreach (Console::getStyles()['backgrounds'] as $bgcolor => $colorValue ){
-    $foregroundColor = ($bgcolor === 'black' || $bgcolor === 'default') ? 'white': 'black';
+foreach (Console::getStyles()['backgrounds'] as $bgcolor => $colorValue) {
+    $foregroundColor = ($bgcolor === 'black' || $bgcolor === 'default') ? 'white' : 'black';
     Console::log('  '.Console::tableRow([
         $bgcolor        => 15, 
-       "\\033[" . $colorValue  .'m'  => 15, 
-        Console::text(str_pad('I am a text color={' . $foregroundColor .'} on bgcolor={' . $bgcolor .'}', 48), $foregroundColor , $bgcolor) => 51
+       "\\033[".$colorValue.'m'  => 15, 
+        Console::text(str_pad('I am a text color={'.$foregroundColor.'} on bgcolor={'.$bgcolor.'}', 48), $foregroundColor, $bgcolor) => 51
     ]));
     $i++;
 }

demo/index.php

Indentation +13 added lines, -13 removed lines

@@ -116,7 +116,7 @@ 
     Console::log();
 
     foreach (getIndex() as $key => $value){
-       if (file_exists( __DIR__ . '/'. $value[2])) {
+        if (file_exists( __DIR__ . '/'. $value[2])) {
             Console::log(''.
                 Console::TableRowStart().
                 Console::TableRowCell(Console::text($key,'lightgray'), 6, Console::ALIGN_CENTER).                                    //no align => default is left
@@ -162,24 +162,24 @@ 
                 printSampleHeader($selectedIndex, $title);
 
                 Console::log($base . Console::text('Start running [', 'white') . 
-                                     Console::text( $title, 'lightcyan') . 
-                                     Console::text('] in file [', 'white')  .
-                                     Console::text( $fileName, 'lightcyan') . 
-                                     Console::text(']', 'white'));
+                                        Console::text( $title, 'lightcyan') . 
+                                        Console::text('] in file [', 'white')  .
+                                        Console::text( $fileName, 'lightcyan') . 
+                                        Console::text(']', 'white'));
 
                 if (file_exists($filePath)){
                     Console::log();
                     include $filePath;
                     Console::log();
                     Console::log($base . Console::text('End running [', 'white')  .
-                                     Console::text( $title, 'lightcyan') . 
-                                     Console::text(']', 'white')); 
+                                        Console::text( $title, 'lightcyan') . 
+                                        Console::text(']', 'white')); 
                     
-                                     $response = Console::ask($base . Console::text('Do you want to see the code that has been executed? (type y/Y to see the code) > ', 'white'));
-                     if (strtoupper($response) === 'Y') {
+                                        $response = Console::ask($base . Console::text('Do you want to see the code that has been executed? (type y/Y to see the code) > ', 'white'));
+                        if (strtoupper($response) === 'Y') {
                         Console::log($base . Console::text('The code in file [', 'white')  .
-                                     Console::text( $fileName, 'lightcyan') . 
-                                     Console::text('] is:', 'white')); 
+                                        Console::text( $fileName, 'lightcyan') . 
+                                        Console::text('] is:', 'white')); 
                         Console::log();
 
                         $lines = file($filePath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
@@ -197,10 +197,10 @@ 
                         Console::log(Console::pad('  ', 100, '-'), 'darkgray');
                         Console::log();
                     }
-               } else {
+                } else {
                     Console::log($base . Console::text('Error' , 'red'));
                     Console::log($base . Console::text(' => File missing [' . $fileName . ']' , 'red'));
-               }
+                }
 
             } else {
                 Console::log($base . Console::text('Error:', 'red'));

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 Console::clear();
@@ -18,15 +18,15 @@ 
 {
     Console::log();
     Console::log();
-    Console::log('    '. Console::text("             _  ____  _          _ _    ", 'red'));
-    Console::log('    '. Console::text("   _ __ ___ (_)/ ___|| |__   ___| | |   ", 'red'));
-    Console::log('    '. Console::text("  | '_ ` _ \| |\___ \| '_ \ / _ \ | |   ", 'red'));
-    Console::log('    '. Console::text("  | | | | | | | ___) | | | |  __/ | |   ", 'red'));
-    Console::log('    '. Console::text("  |_| |_| |_|_||____/|_| |_|\___|_|_|   ", 'red'));
-    Console::log('    '. Console::text("                                        ", 'red'));
-    Console::log('    '. Console::text("                 Version 1.2            ", 'red'));
-    Console::log('    '. Console::text("                 © 2017-2020 Kristuff   ", 'red'));
-    Console::log('    '. Console::text("                                        ", 'red'));
+    Console::log('    '.Console::text("             _  ____  _          _ _    ", 'red'));
+    Console::log('    '.Console::text("   _ __ ___ (_)/ ___|| |__   ___| | |   ", 'red'));
+    Console::log('    '.Console::text("  | '_ ` _ \| |\___ \| '_ \ / _ \ | |   ", 'red'));
+    Console::log('    '.Console::text("  | | | | | | | ___) | | | |  __/ | |   ", 'red'));
+    Console::log('    '.Console::text("  |_| |_| |_|_||____/|_| |_|\___|_|_|   ", 'red'));
+    Console::log('    '.Console::text("                                        ", 'red'));
+    Console::log('    '.Console::text("                 Version 1.2            ", 'red'));
+    Console::log('    '.Console::text("                 © 2017-2020 Kristuff   ", 'red'));
+    Console::log('    '.Console::text("                                        ", 'red'));
     Console::log();
     Console::log();
     Console::log();
@@ -34,11 +34,11 @@ 
     $pad = '    ';
 
     // fake progress message 
-    for ($i=0 ; $i<=100 ; $i++) {
+    for ($i = 0; $i <= 100; $i++) {
 
         // Overwrite progress message. 
         Console::relog($pad.Console::text('This is a fake progress message... [', 'white').
-                            Console::text($i .'%', 'green').
+                            Console::text($i.'%', 'green').
                             Console::text('] completed', 'white'));
 
         // wait for a while, so we see the animation
@@ -54,25 +54,25 @@ 
 {
     $index = [];
     
-    $index[1] =   ['Styles',        'How to get available basic styles',                'demo.styles.php'];
-    $index[2] =   ['Colors',        'How to get available foreground colors',           'demo.colors.php'];
-    $index[3] =   ['Backgrounds',   'How to get available background colors',           'demo.bgcolors.php'];
+    $index[1] = ['Styles', 'How to get available basic styles', 'demo.styles.php'];
+    $index[2] = ['Colors', 'How to get available foreground colors', 'demo.colors.php'];
+    $index[3] = ['Backgrounds', 'How to get available background colors', 'demo.bgcolors.php'];
 //  $index[4] = ['Text',  'Console::text() overview',    'demo.log.php'];      
 //  $index[5] = ['Log',   'Console::log() overview',     'demo.log.php'];      
 //  $index[6] = ['ReLog', 'Console::relog() overview',   'demo.relog.php'];    
-    $index[7] = ['Pad',             'Console::pad() overview',                          'demo.pad.php'];
-    $index[8] = ['Size',  'How to get the number of columns and lines in terminal',     'demo.size.php'];
+    $index[7] = ['Pad', 'Console::pad() overview', 'demo.pad.php'];
+    $index[8] = ['Size', 'How to get the number of columns and lines in terminal', 'demo.size.php'];
     
-    $index[11] =  ['Ask',           'How to ask? (get user input)',                     'demo.ask.php'];
-    $index[12] =  ['Ask Number',    'How to ask and expect a number?',                  'demo.askint.php'];
-    $index[13] =  ['Ask Password',  'How to ask a password? (do not print user input)', 'demo.askpassword.php'];
+    $index[11] = ['Ask', 'How to ask? (get user input)', 'demo.ask.php'];
+    $index[12] = ['Ask Number', 'How to ask and expect a number?', 'demo.askint.php'];
+    $index[13] = ['Ask Password', 'How to ask a password? (do not print user input)', 'demo.askpassword.php'];
    
-    $index[14] =  ['Table',         'How to print a table?',                            'demo.table.php'];
-    $index[15] =  ['Bell',          'How to run the bell?',                             'demo.bell.php'];
-    $index[16] =  ['Progress',      'How to output progress message?',                  'demo.progress.php'];
-    $index[17] =  ['New window',    'How to open new/restore window?',                  'demo.window.php'];
+    $index[14] = ['Table', 'How to print a table?', 'demo.table.php'];
+    $index[15] = ['Bell', 'How to run the bell?', 'demo.bell.php'];
+    $index[16] = ['Progress', 'How to output progress message?', 'demo.progress.php'];
+    $index[17] = ['New window', 'How to open new/restore window?', 'demo.window.php'];
 
-    $index[20] = ['BlueScreen',  'Really nice full screen centered message sample',      'demo.bluescreen.php'];
+    $index[20] = ['BlueScreen', 'Really nice full screen centered message sample', 'demo.bluescreen.php'];
 
     return $index;
 }
@@ -81,11 +81,11 @@ 
 {
     Console::clear();
     Console::log();
-    Console::log(Console::text('  Kristuff/Mishell ', 'darkgray') . Console::text(' v1.2 ', 'white', 'green')); 
-    Console::log(Console::text('  Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray'));
+    Console::log(Console::text('  Kristuff/Mishell ', 'darkgray').Console::text(' v1.2 ', 'white', 'green')); 
+    Console::log(Console::text('  Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray'));
     Console::log(
-        Console::text('  © 2017-2020 Kristuff (', 'darkgray') . 
-        Console::text('https://github.com/kristuff)', 'darkgray', 'underlined') .
+        Console::text('  © 2017-2020 Kristuff (', 'darkgray'). 
+        Console::text('https://github.com/kristuff)', 'darkgray', 'underlined').
         Console::text(')', 'darkgray')
     );
     Console::log();    
@@ -95,7 +95,7 @@ 
 
 function printSampleHeader($index, $title)
 {
-    Console::log('   ' . Console::text(' - '. $index .' - ' . $title . ' ', 'white', 'blue'));
+    Console::log('   '.Console::text(' - '.$index.' - '.$title.' ', 'white', 'blue'));
     Console::log();
 }
 
@@ -115,11 +115,11 @@ 
     Console::log(''.Console::tableRowSeparator($rowHeaders, 'darkgray'));
     Console::log();
 
-    foreach (getIndex() as $key => $value){
-       if (file_exists( __DIR__ . '/'. $value[2])) {
+    foreach (getIndex() as $key => $value) {
+       if (file_exists(__DIR__.'/'.$value[2])) {
             Console::log(''.
                 Console::TableRowStart().
-                Console::TableRowCell(Console::text($key,'lightgray'), 6, Console::ALIGN_CENTER).                                    //no align => default is left
+                Console::TableRowCell(Console::text($key, 'lightgray'), 6, Console::ALIGN_CENTER).//no align => default is left
                 Console::TableRowCell(Console::text($value[0], 'lightgray'), 15).
                 Console::TableRowCell(Console::text($value[1], 'lightgray'), 55)  
             );
@@ -129,8 +129,8 @@ 
     Console::log('');
     Console::log(''.Console::tableRowSeparator($rowHeaders, 'darkgray'));
     Console::log('');
-    Console::log('   '. Console::text('Tips:', 'underlined', 'bold'));
-    Console::log('   '. Console::text(' - At any time you can stop this program using [') .Console::text('Ctrl+C', 'green') .Console::text(']'));
+    Console::log('   '.Console::text('Tips:', 'underlined', 'bold'));
+    Console::log('   '.Console::text(' - At any time you can stop this program using [').Console::text('Ctrl+C', 'green').Console::text(']'));
     Console::log('');
     // reset table separators to defaults
     Console::resetDefaults();
@@ -138,12 +138,12 @@ 
 
 function askIndex()
 {
-    $base = Console::text(' kristuff/mishell-demo' , 'yellow');
-    $base .= Console::text('~$ ' , 'gray');
-    $selectedIndex = Console::askInt($base . Console::text(' Enter desired index then press [Enter] to run sample > ', 'white'));
+    $base = Console::text(' kristuff/mishell-demo', 'yellow');
+    $base .= Console::text('~$ ', 'gray');
+    $selectedIndex = Console::askInt($base.Console::text(' Enter desired index then press [Enter] to run sample > ', 'white'));
     $index = getIndex();
 
-    switch($selectedIndex){
+    switch ($selectedIndex) {
         case 0: 
             Console::log();
 //            Console::restoreWindow();
@@ -155,30 +155,30 @@ 
 
                 $title      = $index[$selectedIndex][0];
                 $fileName   = $index[$selectedIndex][2];
-                $filePath   = __DIR__ . '/'. $fileName;
+                $filePath   = __DIR__.'/'.$fileName;
                 
                 Console::clear();
                 printHeader();
                 printSampleHeader($selectedIndex, $title);
 
-                Console::log($base . Console::text('Start running [', 'white') . 
-                                     Console::text( $title, 'lightcyan') . 
-                                     Console::text('] in file [', 'white')  .
-                                     Console::text( $fileName, 'lightcyan') . 
+                Console::log($base.Console::text('Start running [', 'white'). 
+                                     Console::text($title, 'lightcyan'). 
+                                     Console::text('] in file [', 'white').
+                                     Console::text($fileName, 'lightcyan'). 
                                      Console::text(']', 'white'));
 
-                if (file_exists($filePath)){
+                if (file_exists($filePath)) {
                     Console::log();
                     include $filePath;
                     Console::log();
-                    Console::log($base . Console::text('End running [', 'white')  .
-                                     Console::text( $title, 'lightcyan') . 
+                    Console::log($base.Console::text('End running [', 'white').
+                                     Console::text($title, 'lightcyan'). 
                                      Console::text(']', 'white')); 
                     
-                                     $response = Console::ask($base . Console::text('Do you want to see the code that has been executed? (type y/Y to see the code) > ', 'white'));
+                                     $response = Console::ask($base.Console::text('Do you want to see the code that has been executed? (type y/Y to see the code) > ', 'white'));
                      if (strtoupper($response) === 'Y') {
-                        Console::log($base . Console::text('The code in file [', 'white')  .
-                                     Console::text( $fileName, 'lightcyan') . 
+                        Console::log($base.Console::text('The code in file [', 'white').
+                                     Console::text($fileName, 'lightcyan'). 
                                      Console::text('] is:', 'white')); 
                         Console::log();
 
@@ -186,29 +186,29 @@ 
                         $count = 1;
 
                         Console::log(Console::pad('   ', 100, '-'), 'darkgray');
-                        foreach($lines as $line){
+                        foreach ($lines as $line) {
                             $codeLine = rtrim($line);
                             $isComment = substr(ltrim($codeLine), 0, 2) === '//';
                             $isPhp = substr(ltrim($codeLine), 0, 5) === '<?php' || substr(ltrim($codeLine), 0, 2) === '?>';
                             $color = $isPhp ? 'blue' : ($isComment ? 'green' : 'lightgray');
-                            Console::log('   '. Console::text($codeLine, $color));
+                            Console::log('   '.Console::text($codeLine, $color));
                             $count++;
                         }
                         Console::log(Console::pad('  ', 100, '-'), 'darkgray');
                         Console::log();
                     }
                } else {
-                    Console::log($base . Console::text('Error' , 'red'));
-                    Console::log($base . Console::text(' => File missing [' . $fileName . ']' , 'red'));
+                    Console::log($base.Console::text('Error', 'red'));
+                    Console::log($base.Console::text(' => File missing ['.$fileName.']', 'red'));
                }
 
             } else {
-                Console::log($base . Console::text('Error:', 'red'));
-                Console::log($base . Console::text('=> the value you entered is not a valid index number.', 'red'));
+                Console::log($base.Console::text('Error:', 'red'));
+                Console::log($base.Console::text('=> the value you entered is not a valid index number.', 'red'));
                 askIndex();
             }
 
-            Console::ask($base . Console::text('Press [Enter] to go back to index > ', 'white'));
+            Console::ask($base.Console::text('Press [Enter] to go back to index > ', 'white'));
             goIndex();
     }
 }
\ No newline at end of file