kristuff / mishell

demo/index.php

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.5            ", 'red'));
-    Console::log('    '. Console::text("                 © 2017-2021 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.5            ", 'red'));
+    Console::log('    '.Console::text("                 © 2017-2021 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-2021 Kristuff (', 'darkgray') . 
-        Console::text('https://github.com/kristuff)', 'darkgray', 'underlined') .
+        Console::text('  © 2017-2021 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

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