kristuff / mishell

lib/ShellWriter.php

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
      */
     public static function getColumns() 
     {
-        if (!self::isWin() ){
+        if (!self::isWin()) {
             return (int) shell_exec('tput cols');
         }
     }
@@ -68,7 +68,7 @@ 
      */
     public static function getLines() 
     {
-        if (!self::isWin() ){
+        if (!self::isWin()) {
             return (int) shell_exec('tput lines');
         }
     }
@@ -83,7 +83,7 @@ 
      */
     public static function newWindow() 
     {
-        if (!self::isWin() ){
+        if (!self::isWin()) {
             system('tput smcup');
             self::clear();
         }
@@ -99,7 +99,7 @@ 
      */
     public static function restoreWindow() 
     {
-        if (!self::isWin() ){
+        if (!self::isWin()) {
             system('tput rmcup');
         }
     }
@@ -114,7 +114,7 @@ 
      */
     public static function hideInput()
     {
-        if (!self::isWin() ){
+        if (!self::isWin()) {
             system('stty -echo');
         }
     }
@@ -129,7 +129,7 @@ 
      */
     public static function restoreInput()
     {
-        if (!self::isWin()){
+        if (!self::isWin()) {
             system('stty echo');
         }
     }

lib/ShellTableWriter.php

Spacing +18 added lines, -18 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 separator sign. 
@@ -104,7 +104,7 @@ 
      * @access public
      * @var    string
      */
-    public static $verticalInnerSeparator   = '+';
+    public static $verticalInnerSeparator = '+';
            
     /**
      * Resets the default options
@@ -139,13 +139,13 @@ 
         $columnsPads = !empty($args) ? $args[0] : [];
         array_shift($args);
 
-        $str = self::$verticalSeparator ;
-        $cellPaddingLenght = strlen(self::$tableCellPadding) *2;
-        foreach ($columnsPads as $key => $pad){
-            $str .= str_repeat(self::$horizontalSeparator , $pad + $cellPaddingLenght) .self::$verticalInnerSeparator ;
+        $str = self::$verticalSeparator;
+        $cellPaddingLenght = 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, strlen($str) -1). self::$verticalSeparator, $args);
+        return self::getCliString(self::$verticalInnerSeparator === '' ? $str : substr($str, 0, strlen($str)-1).self::$verticalSeparator, $args);
     }
 
      /**
@@ -165,12 +165,12 @@ 
         $columnsPads = !empty($args) ? $args[0] : [];
         array_shift($args);
 
-        $str = self::$verticalSeparator ;
-        $cellPaddingLenght = strlen(self::$tableCellPadding) *2;
-        foreach ($columnsPads as $key => $pad){
-            $str .= str_repeat(self::$horizontalSeparator , $pad + $cellPaddingLenght) .self::$horizontalSeparator;
+        $str = self::$verticalSeparator;
+        $cellPaddingLenght = strlen(self::$tableCellPadding)*2;
+        foreach ($columnsPads as $key => $pad) {
+            $str .= str_repeat(self::$horizontalSeparator, $pad+$cellPaddingLenght).self::$horizontalSeparator;
         }
-        return self::getCliString(substr($str, 0, strlen($str) -1). self::$verticalSeparator, $args);
+        return self::getCliString(substr($str, 0, strlen($str)-1).self::$verticalSeparator, $args);
     }
 
     /**
@@ -193,12 +193,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);
     }
@@ -261,7 +261,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.
@@ -269,6 +269,6 @@ 
         }
 
         // format full row
-        return self::getCliString($str, $args) ; 
+        return self::getCliString($str, $args); 
     }
 }
\ No newline at end of file

lib/ShellColoredWriter.php

Spacing +33 added lines, -33 removed lines

@@ -29,7 +29,7 @@ 
      * @var    array
      */
     protected static $foregroundColors = array(
-        'normal'       => '39',   // your default color
+        'normal'       => '39', // your default color
         'black'        => '30', 
         'gray'         => '1;30',
         'lightgray'    => '37', 
@@ -74,11 +74,11 @@ 
      * @var    array
      */
     protected static $options = array(
-        'none'         => '0',    // reset all styles
-        'bold'         => '1',    // 
+        'none'         => '0', // reset all styles
+        'bold'         => '1', // 
         'underline'    => '4',    
         'blink'        => '5', 
-        'reverse'      => '7',    // reverse foreground/background color
+        'reverse'      => '7', // reverse foreground/background color
     );
     
     /**
@@ -117,27 +117,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
             
             // ****************************************
             // Write methods (echo and return null)
             // ****************************************
             
             case'write':
-                echo (self::getCliString($str, $args));               // write text
+                echo (self::getCliString($str, $args)); // write text
                 break;
             case'log':
-                echo (self::getCliString($str, $args) . self::$EOF );   // write text + newline
+                echo (self::getCliString($str, $args).self::$EOF); // write text + newline
                 break;
             case'relog':
-                echo (self::getCliString($str ."\r", $args));         // overwrite current line 
+                echo (self::getCliString($str."\r", $args)); // overwrite current line 
                 break;
 
             // ****************************************
@@ -145,19 +145,19 @@ 
             // ****************************************
 
             case'ask':
-                echo (self::getCliString($str, $args));     // write question
-                return trim(fgets(STDIN));                  // reads and return one line from STDIN 
+                echo (self::getCliString($str, $args)); // write question
+                return trim(fgets(STDIN)); // reads and return one line from STDIN 
            
             case'askPassword':
-                self::hideInput();                          // hide 
-                echo (self::getCliString($str, $args));     // write 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)); // write question
+                $line = trim(fgets(STDIN)); // reads one line from STDIN 
+                self::restoreInput(); // restore 
+                return $line; // return line
                 
             case 'askInt':
-                echo (self::getCliString($str, $args));     // write question
-                fscanf(STDIN, "%d\n", $number);             // reads number from STDIN
+                echo (self::getCliString($str, $args)); // write question
+                fscanf(STDIN, "%d\n", $number); // reads number from STDIN
                 return (is_int($number) ? $number : false); // return int value or false
         }
 
@@ -177,7 +177,7 @@ 
      */
     protected static function getCliString($str, array $arguments = [])
     {
-        if (empty($arguments)){
+        if (empty($arguments)) {
             return $str;
         }
 
@@ -190,24 +190,24 @@ 
         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
-        $coloredString .= "\033[" . implode(';',$cliArgs) .'m';
-        $coloredString .=  $str . "\033[0m";
+        $coloredString .= "\033[".implode(';', $cliArgs).'m';
+        $coloredString .= $str."\033[0m";
         return $coloredString;
     }
 
@@ -291,7 +291,7 @@ 
      */
     public static function askPassword()
     {
-        return self::cmd('askPassword',func_get_args());
+        return self::cmd('askPassword', func_get_args());
     }
 
     /**
@@ -308,7 +308,7 @@ 
      */
     public static function log()
     {
-        self::cmd('log',func_get_args());
+        self::cmd('log', func_get_args());
     }
 
     /**
@@ -325,7 +325,7 @@ 
      */
     public static function relog()
     {
-        self::cmd('relog',func_get_args());
+        self::cmd('relog', func_get_args());
     }  
        
     /**
@@ -342,20 +342,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;

demo/demo.askint.php

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 
 Console::log('Overview:', 'underline', 'bold');
-Console::log("  - Use " .  Console::text("Console::askInt(\$str [\$styles])", 'blue', 'white') . " to ask user to enter a number in the console.");
+Console::log("  - Use ".Console::text("Console::askInt(\$str [\$styles])", 'blue', 'white')." to ask user to enter a number in the console.");
 Console::log('');
 Console::log('Tips:', 'underline', 'bold');
 Console::log("  - The method returns Int value or False if the entered value is not a valid int number.", 'lightmagenta');
@@ -13,9 +13,9 @@ 
 Console::log("    and Console::log() methods..", 'lightmagenta');
 Console::log('');
 Console::log('Usage:', 'underline', 'bold');
-Console::log('   ' . Console::text(Console::pad("\$value = Console::askInt('Please enter a number > ');", 80), 'blue', 'white')); 
-Console::log('   ' . Console::text(Console::pad("if (\$value !== false) {", 80), 'blue', 'white')); 
-Console::log('   ' . Console::text(Console::pad(" [...]", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad("\$value = Console::askInt('Please enter a number > ');", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad("if (\$value !== false) {", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad(" [...]", 80), 'blue', 'white')); 
 Console::log('');
 Console::log('Sample:', 'underline', 'bold');
 
@@ -23,8 +23,8 @@ 
 {
     $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'));

demo/demo.askpassword.php

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 Console::log('Overview:', 'underline', 'bold');
-Console::log("  Use " .  Console::text("Console::askPassword(\$str [\$styles])", 'blue', 'white') . " to ask user to enter a value and return this value.", 'white');
+Console::log("  Use ".Console::text("Console::askPassword(\$str [\$styles])", 'blue', 'white')." to ask user to enter a value and return this value.", 'white');
 Console::log('');
 Console::log('Tips:', 'underline', 'bold');
 Console::log("  - you can customize colors (foreground and background) and some styles in same way than with Console::text()", 'green');
@@ -14,11 +14,11 @@ 
 Console::log("  - User input are not hidden on windows platform (not supported)", 'red', 'yellow');
 Console::log('');
 Console::log('Usage:', 'underline', 'bold');
-Console::log('   ' . Console::text(Console::pad("\$value = Console::askPassword('Please Enter something (We wont display it, for now...)  > ');", 80), 'blue', 'white')); 
-Console::log('   ' . Console::text(Console::pad("Console::log();", 80), 'blue', 'white')); 
-Console::log('   ' . Console::text(Console::pad("Console::log('=> the value you entered is [' . Console::text(\$value, 'red') . ']');", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad("\$value = Console::askPassword('Please Enter something (We wont display it, for now...)  > ');", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad("Console::log();", 80), 'blue', 'white')); 
+Console::log('   '.Console::text(Console::pad("Console::log('=> the value you entered is [' . Console::text(\$value, 'red') . ']');", 80), 'blue', 'white')); 
 Console::log('');
 Console::log('Sample:', 'underline', 'bold');
 $value = Console::askPassword('Please Enter something (We wont display it, for now...)  > ');
 Console::log();
-Console::log('=> the value you entered is [' . Console::text($value, 'red') . ']');
\ No newline at end of file
+Console::log('=> the value you entered is ['.Console::text($value, 'red').']');
\ No newline at end of file

demo/demo.styles.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;
 
 // the row header
@@ -17,13 +17,13 @@ 
 
 $index = 1;
 
-foreach (Console::getStyles()[ 'options' ] as $option => $value){
-    Console::log('  ' .
+foreach (Console::getStyles()['options'] as $option => $value) {
+    Console::log('  '.
        Console::tableRow([
        $index    => 7,
        $option   => 15, 
-       "\\033[" . $value  .'m'  => 15, 
-       Console::text(str_pad('I am a text style={' . $option .'}', 48), $option) => 50
+       "\\033[".$value.'m'  => 15, 
+       Console::text(str_pad('I am a text style={'.$option.'}', 48), $option) => 50
     ]));
     Console::log('  '.Console::tableRowEmpty($rowHeaders)); // add blank row between element 
     $index++; 

demo/demo.progress.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 Console::log('Overview:', 'underline', 'bold');
@@ -15,10 +15,10 @@ 
 
 Console::log('Sample code:', 'underline', 'bold');
 Console::log('');
-Console::log('    '.Console::text(str_pad('// fake progress loop ', 100),'red', 'white'));
+Console::log('    '.Console::text(str_pad('// fake progress loop ', 100), 'red', 'white'));
 Console::log('    '.Console::text(str_pad('for ($i=0 ; $i<=10 ; $i++) {', 100), 'black', 'white'));
-Console::log('    '.Console::text(str_pad('    // Overwrite progress message.',  100), 'red', 'white'));
-Console::log('    '.Console::text(str_pad("    Console::relog(' I am a progress text... ['.Console::text($\i, 'green') .']% completed');",  100),'black', 'white'));
+Console::log('    '.Console::text(str_pad('    // Overwrite progress message.', 100), 'red', 'white'));
+Console::log('    '.Console::text(str_pad("    Console::relog(' I am a progress text... ['.Console::text($\i, 'green') .']% completed');", 100), 'black', 'white'));
 Console::log('    '.Console::text(str_pad('', 100), 'black', 'white'));
 Console::log('    '.Console::text(str_pad("    // wait for a while, so we see the animation ", 100), 'red', 'white'));
 Console::log('    '.Console::text(str_pad('     usleep(300000);', 100), 'black', 'white'));
@@ -40,10 +40,10 @@ 
 Console::log('Sample result:', 'underline', 'bold');
 
 // 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,5 +59,5 @@ 
 
 // 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', 'underline'). str_pad(' ', 100));
+Console::relog(Console::text('Done!', 'white', 'green', 'underline').str_pad(' ', 100));
 Console::log('');

demo/demo.window.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 use Kristuff\Mishell\Console;
 
 Console::log();
@@ -11,7 +11,7 @@ 
 
 
 Console::log('Let say we are current window.');
-Console::log('We will open a new window using ' . Console::text('Console::newWindow()', 'blue', 'white') . ' method.');
+Console::log('We will open a new window using '.Console::text('Console::newWindow()', 'blue', 'white').' method.');
 Console::ask('Press [Enter] to open new window > ');
 
 // *open* new window
@@ -25,14 +25,14 @@ 
 Console::log();
 
 
-Console::log('I am in new window. We will restore the window later using ' .  Console::text('Console::restoreWindow()', 'blue', 'white') . ' method.' );
+Console::log('I am in new window. We will restore the window later using '.Console::text('Console::restoreWindow()', 'blue', 'white').' 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()', 'blue', 'white') . ' method');
-Console::log('We will reopen a new window using ' . Console::text('Console::newWindow()', 'blue', 'white') . ' method.');
+Console::log('We have now restored the current window using '.Console::text('Console::restoreWindow()', 'blue', 'white').' method');
+Console::log('We will reopen a new window using '.Console::text('Console::newWindow()', 'blue', 'white').' method.');
 Console::ask('Press [Enter] to open new window > ');
 
 // *open* new window
@@ -45,12 +45,12 @@ 
 Console::log(Console::text('_____________________________', 'white', 'yellow', 'bold'));
 Console::log();
 
-Console::log('I am in new window. We will restore the window later using ' .  Console::text('Console::restoreWindow()', 'blue', 'white') . ' method.' );
+Console::log('I am in new window. We will restore the window later using '.Console::text('Console::restoreWindow()', 'blue', 'white').' 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()', 'blue', 'white') . ' 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()', 'blue', 'white').' method. That\'s all.');
+Console::log('Got it'.Console::text('?', 'green'));

demo/demo.ask.php

Spacing +7 added lines, -7 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('Overview:', 'underline', 'bold');
-Console::log("  - Use " .  Console::text("string Console::ask ( string \$str [, \$styles] )", 'blue', 'white') . "to ask something to user in the console.");
+Console::log("  - Use ".Console::text("string Console::ask ( string \$str [, \$styles] )", 'blue', 'white')."to ask something to user in the console.");
 Console::log('');
 Console::log('Tips:', 'underline', 'bold');
 Console::log("  - you can customize colors (foreground and background) and some styles in same way than with Console::text()", 'lightmagenta');
 Console::log("    and Console::log() methods.", 'lightmagenta');
 Console::log('');
 Console::log('Usage:', 'underline', 'bold');
-Console::log('   '. Console::text(Console::pad("\$value1 = Console::ask('Please enter something > ');", 90), 'blue', 'white'));
-Console::log('   '. Console::text(Console::pad("// or);", 90), 'green', 'white'));
-Console::log('   '. Console::text(Console::pad("\$value2 = Console::ask('Please enter something > ', 'red', 'white', 'underline');", 90), 'blue', 'white'));
+Console::log('   '.Console::text(Console::pad("\$value1 = Console::ask('Please enter something > ');", 90), 'blue', 'white'));
+Console::log('   '.Console::text(Console::pad("// or);", 90), 'green', 'white'));
+Console::log('   '.Console::text(Console::pad("\$value2 = Console::ask('Please enter something > ', 'red', 'white', 'underline');", 90), 'blue', 'white'));
 Console::log('');
 
 $value = Console::ask('Please enter something > ');
-Console::log('=> the value you entered is [' . Console::text($value, 'yellow') . ']');
+Console::log('=> the value you entered is ['.Console::text($value, 'yellow').']');
 
 $value2 = Console::ask('Please enter something > ', 'red', 'white', 'underline');
-Console::log('=> the value you entered is [' . Console::text($value2, 'yellow') . ']');
\ No newline at end of file
+Console::log('=> the value you entered is ['.Console::text($value2, 'yellow').']');
\ No newline at end of file