kristuff / abuseipdb-cli

src/AbuseIPDBClient.php

Indentation +29 added lines, -29 removed lines

@@ -193,10 +193,10 @@ 
      *
      * @access public
      * @static
-	 * @param string    $filePath       The file's full path
-	 * @param bool      $throwError     Throw error on true or silent process. Default is true
+     * @param string    $filePath       The file's full path
+     * @param bool      $throwError     Throw error on true or silent process. Default is true
      *  
-	 * @return object|null 
+     * @return object|null 
      * @throws \Exception
      * @throws \LogicException
      */
@@ -204,10 +204,10 @@ 
     {
         // check file exists
         if (!file_exists($filePath) || !is_file($filePath)){
-           if ($throwError) {
+            if ($throwError) {
                 throw new \Exception('Config file not found');
-           }
-           return null;  
+            }
+            return null;  
         }
 
         // get and parse content
@@ -277,38 +277,38 @@ 
     {
         Console::log(' ' . Console::text('SYNOPSIS:', 'white', 'underline')); 
         Console::log(' ' . Console::text('    abuseipdb -C ') . 
-                           Console::text('ip', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('days', 'yellow') . 
-                           Console::text('] [-v] [-l ') . 
-                           Console::text('limit', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('ip', 'yellow') . 
+                            Console::text(' [-d ') . 
+                            Console::text('days', 'yellow') . 
+                            Console::text('] [-v] [-l ') . 
+                            Console::text('limit', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -K ') . 
-                           Console::text('network', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('days', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('network', 'yellow') . 
+                            Console::text(' [-d ') . 
+                            Console::text('days', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -R ' .
-                           Console::text('ip', 'yellow') . ' -c ' .
-                           Console::text('categories', 'yellow') . ' -m ' .
-                           Console::text('message', 'yellow'))); 
+                            Console::text('ip', 'yellow') . ' -c ' .
+                            Console::text('categories', 'yellow') . ' -m ' .
+                            Console::text('message', 'yellow'))); 
 
         Console::log(' ' . Console::text('    abuseipdb -V ' .
-                           Console::text('path', 'yellow')));
+                            Console::text('path', 'yellow')));
 
         Console::log(' ' . Console::text('    abuseipdb -E ' .
-                           Console::text('ip', 'yellow')));
+                            Console::text('ip', 'yellow')));
                            
         Console::log(' ' . Console::text('    abuseipdb -B ') . 
-                           Console::text('[-l ') . 
-                           Console::text('limit', 'yellow') . 
-                           Console::text('] [-s ') . 
-                           Console::text('score', 'yellow') . 
-                           Console::text('] [-p ') . 
-                           Console::text('', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('[-l ') . 
+                            Console::text('limit', 'yellow') . 
+                            Console::text('] [-s ') . 
+                            Console::text('score', 'yellow') . 
+                            Console::text('] [-p ') . 
+                            Console::text('', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -L '));
         Console::log(' ' . Console::text('    abuseipdb -G '));
@@ -864,7 +864,7 @@ 
 
                     $line  = Console::text('    →', $defaultColor);
                     $line .= self::printResult(' reported at: ', self::getDate($lastReport->reportedAt), $defaultColor, '', false);
-              //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
+                //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
                     if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)){
                         $line .= Console::text(' from: ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryCode, $defaultColor, '', false);

Spacing +149 added lines, -150 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * @var string      
      */
-    const LONG_ARGUMENTS = ['config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'plaintext', 'clear:','bulk-report:', 'help', 'verbose', 'score:','version'];
+    const LONG_ARGUMENTS = ['config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'plaintext', 'clear:', 'bulk-report:', 'help', 'verbose', 'score:', 'version'];
     
     /**
      * @var string      $version
@@ -53,7 +53,7 @@ 
     /**
      * @var string      $keyPath
      */
-    private static $keyPath = __DIR__ .'/../config/key.json';
+    private static $keyPath = __DIR__.'/../config/key.json';
 
     /**
      * The entry point of our app 
@@ -68,13 +68,13 @@ 
     public static function start(array $arguments, string $keyPath)
     {
         // prints help, (no need install) ?
-        if (self::inArguments($arguments, 'h', 'help')){
+        if (self::inArguments($arguments, 'h', 'help')) {
             self::printBanner();
             self::printHelp();
             self::safeExit();
         }
         // prints version?  (note: no short arg)
-        if (self::inArguments($arguments, 'version', 'version')){
+        if (self::inArguments($arguments, 'version', 'version')) {
             self::printVersion();
             self::safeExit();
         }
@@ -82,7 +82,7 @@ 
         // get key path from current script location (supposed in a bin folder)
         // and check for install then create a new instance of \ApiHandler
         self::$keyPath = $keyPath; // dirname(get_included_files()[0]) . '/../config/key.json';
-        self::validate( self::checkForInstall(), 'Key file missing.');
+        self::validate(self::checkForInstall(), 'Key file missing.');
         try {
             self::$api = self::fromConfigFile(self::$keyPath);
         } catch (\Exception $e) {
@@ -92,53 +92,53 @@ 
         }
     
         // required at least one valid argument
-        self::validate( !empty($arguments), 'No valid arguments given. Run abuseipdb --help to get help.');
+        self::validate(!empty($arguments), 'No valid arguments given. Run abuseipdb --help to get help.');
 
 
         // prints config ?
-        if (self::inArguments($arguments, 'G', 'config')){
+        if (self::inArguments($arguments, 'G', 'config')) {
             self::printConfig();
             self::safeExit();
         } 
 
         // prints catgeories ?
-        if (self::inArguments($arguments, 'L', 'list')){
+        if (self::inArguments($arguments, 'L', 'list')) {
             self::printCategories();
             self::safeExit();
         } 
         
         // check request ?
-        if (self::inArguments($arguments, 'C', 'check')){
+        if (self::inArguments($arguments, 'C', 'check')) {
             self::checkIP($arguments);
             self::safeExit();
         }
        
         // check-block request ?
-        if (self::inArguments($arguments, 'K', 'check-block')){
+        if (self::inArguments($arguments, 'K', 'check-block')) {
             self::checkBlock($arguments);
             self::safeExit();
         }
 
         // report request ?
-        if (self::inArguments($arguments, 'R', 'report')){
+        if (self::inArguments($arguments, 'R', 'report')) {
             self::reportIP($arguments);
             self::safeExit();
         }
 
         // report request ?
-        if (self::inArguments($arguments, 'V', 'bulk-report')){
+        if (self::inArguments($arguments, 'V', 'bulk-report')) {
             self::bulkReport($arguments);
             self::safeExit();
         }
 
         // report request ?
-        if (self::inArguments($arguments, 'B', 'blacklist')){
+        if (self::inArguments($arguments, 'B', 'blacklist')) {
             self::getBlacklist($arguments);
             self::safeExit();
         }
 
         // report request ?
-        if (self::inArguments($arguments, 'E', 'clear')){
+        if (self::inArguments($arguments, 'E', 'clear')) {
             self::clearIP($arguments);
             self::safeExit();
         }
@@ -164,21 +164,21 @@ 
     public static function fromConfigFile(string $configPath)
     {
         // check file exists
-        if (!file_exists($configPath) || !is_file($configPath)){
-            throw new \InvalidArgumentException('The file [' . $configPath . '] does not exist.');
+        if (!file_exists($configPath) || !is_file($configPath)) {
+            throw new \InvalidArgumentException('The file ['.$configPath.'] does not exist.');
         }
 
         // check file is readable
-        if (!is_readable($configPath)){
-            throw new InvalidPermissionException('The file [' . $configPath . '] is not readable.');
+        if (!is_readable($configPath)) {
+            throw new InvalidPermissionException('The file ['.$configPath.'] is not readable.');
         }
 
         $keyConfig = self::loadJsonFile($configPath);
         $selfIps = [];
         
         // Look for other optional config files in the same directory 
-        $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR . 'self_ips.json';
-        if (file_exists($selfIpsConfigPath)){
+        $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.'self_ips.json';
+        if (file_exists($selfIpsConfigPath)) {
             $selfIps = self::loadJsonFile($selfIpsConfigPath)->self_ips;
         }
 
@@ -202,7 +202,7 @@ 
     protected static function loadJsonFile(string $filePath, bool $throwError = true)
     {
         // check file exists
-        if (!file_exists($filePath) || !is_file($filePath)){
+        if (!file_exists($filePath) || !is_file($filePath)) {
            if ($throwError) {
                 throw new \Exception('Config file not found');
            }
@@ -238,23 +238,23 @@ 
         // not installed
         self::printBanner();
         Console::log(' Your config key file was not found. Do you want to create it? ', 'white');
-        $create =  Console::ask(' Press Y/y to create a config key file: ', 'white');
+        $create = Console::ask(' Press Y/y to create a config key file: ', 'white');
             
         if ($create == 'Y' || $create == 'y') {
-            $key =     Console::ask(' - Please enter your api key: ', 'white');
-            $create =  Console::ask(' A config file will be created in config/ directory. Press Y/y to continue: ', 'white');
+            $key = Console::ask(' - Please enter your api key: ', 'white');
+            $create = Console::ask(' A config file will be created in config/ directory. Press Y/y to continue: ', 'white');
             
             if ($create == 'Y' || $create == 'y') {
                 $data = json_encode(['api_key' => $key]);
                 
-                if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false){
+                if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false) {
                     self::error('An error occured during writing config file. Make sure to give the appropriate permissions do the config directory.');
                     return false;
                 }
 
                 // successfull. print message and exit to prevent errors with no arguments 
                 Console::log();
-                Console::log(Console::text('  ✓ ', 'green') . Console::text('Your config file has been successfully created.', 'white'));
+                Console::log(Console::text('  ✓ ', 'green').Console::text('Your config file has been successfully created.', 'white'));
                 Console::log('    You can now use abuseipdb.', 'white');
                 Console::log();
                 self::safeExit();
@@ -274,47 +274,47 @@ 
      */
     protected static function printHelp()
     {
-        Console::log(' ' . Console::text('SYNOPSIS:', 'white', 'underline')); 
-        Console::log(' ' . Console::text('    abuseipdb -C ') . 
-                           Console::text('ip', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('days', 'yellow') . 
-                           Console::text('] [-v] [-l ') . 
-                           Console::text('limit', 'yellow') . 
+        Console::log(' '.Console::text('SYNOPSIS:', 'white', 'underline')); 
+        Console::log(' '.Console::text('    abuseipdb -C '). 
+                           Console::text('ip', 'yellow'). 
+                           Console::text(' [-d '). 
+                           Console::text('days', 'yellow'). 
+                           Console::text('] [-v] [-l '). 
+                           Console::text('limit', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -K ') . 
-                           Console::text('network', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('days', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -K '). 
+                           Console::text('network', 'yellow'). 
+                           Console::text(' [-d '). 
+                           Console::text('days', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -R ' .
-                           Console::text('ip', 'yellow') . ' -c ' .
-                           Console::text('categories', 'yellow') . ' -m ' .
+        Console::log(' '.Console::text('    abuseipdb -R '.
+                           Console::text('ip', 'yellow').' -c '.
+                           Console::text('categories', 'yellow').' -m '.
                            Console::text('message', 'yellow'))); 
 
-        Console::log(' ' . Console::text('    abuseipdb -V ' .
+        Console::log(' '.Console::text('    abuseipdb -V '.
                            Console::text('path', 'yellow')));
 
-        Console::log(' ' . Console::text('    abuseipdb -E ' .
+        Console::log(' '.Console::text('    abuseipdb -E '.
                            Console::text('ip', 'yellow')));
                            
-        Console::log(' ' . Console::text('    abuseipdb -B ') . 
-                           Console::text('[-l ') . 
-                           Console::text('limit', 'yellow') . 
-                           Console::text('] [-s ') . 
-                           Console::text('score', 'yellow') . 
-                           Console::text('] [-p ') . 
-                           Console::text('', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -B '). 
+                           Console::text('[-l '). 
+                           Console::text('limit', 'yellow'). 
+                           Console::text('] [-s '). 
+                           Console::text('score', 'yellow'). 
+                           Console::text('] [-p '). 
+                           Console::text('', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -L '));
-        Console::log(' ' . Console::text('    abuseipdb -G '));
-        Console::log(' ' . Console::text('    abuseipdb -h '));
+        Console::log(' '.Console::text('    abuseipdb -L '));
+        Console::log(' '.Console::text('    abuseipdb -G '));
+        Console::log(' '.Console::text('    abuseipdb -h '));
                            
         Console::log();    
-        Console::log(' ' . Console::text('OPTIONS:', 'white', 'underline')); 
+        Console::log(' '.Console::text('OPTIONS:', 'white', 'underline')); 
         Console::log();
         Console::log(Console::text('   -h, --help', 'white')); 
         Console::log('       Prints the current help. If given, all next arguments are ignored.', 'lightgray');
@@ -325,39 +325,39 @@ 
         Console::log(Console::text('   -L, --list', 'white')); 
         Console::log('       Prints the list report categories. If given, all next arguments are ignored.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -C, --check ', 'white') . Console::text('ip', 'yellow', 'underline')); 
+        Console::log(Console::text('   -C, --check ', 'white').Console::text('ip', 'yellow', 'underline')); 
         Console::log('       Performs a check request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -K, --check-block ', 'white') . Console::text('network', 'yellow', 'underline')); 
+        Console::log(Console::text('   -K, --check-block ', 'white').Console::text('network', 'yellow', 'underline')); 
         Console::log('       Performs a check-block request for the given network. A valid subnet (v4 or v6) denoted with ', 'lightgray');
         Console::log('       CIDR notation is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -d, --days ', 'white') . Console::text('days', 'yellow', 'underline')); 
+        Console::log(Console::text('   -d, --days ', 'white').Console::text('days', 'yellow', 'underline')); 
         Console::log('       For a check or check-block request, defines the maxAgeDays. Min is 1, max is 365, default is 30.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -R, --report ', 'white') . Console::text('ip', 'yellow', 'underline')); 
+        Console::log(Console::text('   -R, --report ', 'white').Console::text('ip', 'yellow', 'underline')); 
         Console::log('       Performs a report request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -V, --bulk-report ', 'white') . Console::text('path', 'yellow', 'underline')); 
+        Console::log(Console::text('   -V, --bulk-report ', 'white').Console::text('path', 'yellow', 'underline')); 
         Console::log('       Performs a bulk-report request sending a csv file. A valid file name or full path is required.', 'lightgray');
         Console::log();    
         Console::log(Console::text('   -E, --clear ', 'white')); 
         Console::log('       Remove own reports for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();
-        Console::log(Console::text('   -c, --categories ', 'white') . Console::text('categories', 'yellow', 'underline')); 
+        Console::log(Console::text('   -c, --categories ', 'white').Console::text('categories', 'yellow', 'underline')); 
         Console::log('       For a report request, defines the report category(ies). Categories must be separate by a comma.', 'lightgray');
         Console::log('       Some categories cannot be used alone. A category can be represented by its shortname or by its', 'lightgray');
-        Console::log(Console::text('       id. Use ','lightgray')  . Console::text('abuseipdb -L', 'white') . Console::text(' to print the categories list.','lightgray'));
+        Console::log(Console::text('       id. Use ', 'lightgray').Console::text('abuseipdb -L', 'white').Console::text(' to print the categories list.', 'lightgray'));
         Console::log();    
-        Console::log(Console::text('   -m, --message ', 'white') . Console::text('message', 'yellow', 'underline')); 
+        Console::log(Console::text('   -m, --message ', 'white').Console::text('message', 'yellow', 'underline')); 
         Console::log('       For a report request, defines the message to send with report. Message is required for all', 'lightgray');
         Console::log('       report requests.', 'lightgray');
         Console::log();
         Console::log(Console::text('   -B, --blacklist ', 'white')); 
         Console::log('       Performs a blacklist request. Default limit is 1000. This limit can ne changed with the', 'lightgray');
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
         Console::log();    
-        Console::log(Console::text('   -l, --limit ', 'white') . Console::text('limit', 'yellow', 'underline')); 
+        Console::log(Console::text('   -l, --limit ', 'white').Console::text('limit', 'yellow', 'underline')); 
         Console::log('       For a blacklist request, defines the limit.', 'lightgray');
         Console::log('       For a check request with verbose flag, sets the max number of last reports displayed. Default is 10', 'lightgray');
         Console::log('       For a check-block request, sets the max number of IPs displayed. Default is 0 (no limit).', 'lightgray');
@@ -372,7 +372,7 @@ 
         Console::log(Console::text('   -v, --verbose ', 'white')); 
         Console::log('       For a check request, display additional fields like the x last reports. This increases ', 'lightgray');
         Console::log(Console::text('       request time and response size. Max number of last reports displayed can be changed with the ', 'lightgray'));
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
         Console::log();    
         Console::log(Console::text('   --version', 'white')); 
         Console::log('       Prints the current version. If given, all next arguments are ignored.', 'lightgray');
@@ -393,11 +393,11 @@ 
 
         self::printTitle(Console::text('  ► Current configuration ', 'darkgray'));
         
-        Console::log(Console::text('  api_key:[', 'white') . Console::text($conf['apiKey'], 'green') . Console::text(']', 'white'));
+        Console::log(Console::text('  api_key:[', 'white').Console::text($conf['apiKey'], 'green').Console::text(']', 'white'));
         Console::log(Console::text('  self_ips:', 'white'));
         
         foreach ($conf['selfIps'] as $ip) {
-            Console::log(Console::text('    [', 'white') . Console::text($ip, 'green') . Console::text(']', 'white'));   
+            Console::log(Console::text('    [', 'white').Console::text($ip, 'green').Console::text(']', 'white'));   
         }
 
         Console::log();   
@@ -418,10 +418,10 @@ 
 
         $categories = self::$api->getCategories();
         $rowHeaders = [
-            Console::text('ShortName',      'darkgray') => 15, 
-            Console::text('Id',             'darkgray') => 2, 
-            Console::text('Full name',      'darkgray') => 18,
-            Console::text('Can be alone?',  'darkgray') => 15
+            Console::text('ShortName', 'darkgray') => 15, 
+            Console::text('Id', 'darkgray') => 2, 
+            Console::text('Full name', 'darkgray') => 18,
+            Console::text('Can be alone?', 'darkgray') => 15
         ];
         Console::$verticalSeparator = '  ';
         Console::$verticalInnerSeparator = '  ';
@@ -431,17 +431,16 @@ 
         
         foreach ($categories as $cat) {
             $id = Console::text($cat[1], 'white');
-            $standalone = $cat[3] ? Console::text('✓', 'green') . Console::text(' true ', 'lightgray') : 
-                                    Console::text('✗', 'red')   . Console::text(' false', 'darkgray');
-            $shortName =  Console::text($cat[0], 'white');
-            $fullName =   Console::text($cat[2], 'lightgray');
+            $standalone = $cat[3] ? Console::text('✓', 'green').Console::text(' true ', 'lightgray') : Console::text('✗', 'red').Console::text(' false', 'darkgray');
+            $shortName = Console::text($cat[0], 'white');
+            $fullName = Console::text($cat[2], 'lightgray');
 
             Console::log(
                 Console::TableRowStart().  
-                Console::TableRowCell( $shortName , 15).  
-                Console::TableRowCell( $id , 2, Console::ALIGN_CENTER).  
-                Console::TableRowCell( $fullName , 18).  
-                Console::TableRowCell( $standalone , 15,  Console::ALIGN_CENTER)  
+                Console::TableRowCell($shortName, 15).  
+                Console::TableRowCell($id, 2, Console::ALIGN_CENTER).  
+                Console::TableRowCell($fullName, 18).  
+                Console::TableRowCell($standalone, 15, Console::ALIGN_CENTER)  
             );
         }
         //Console::log(Console::tableRowSeparator($rowHeaders), 'darkgray');
@@ -460,11 +459,11 @@ 
      */
     protected static function reportIP(array $arguments)
     {
-        $ip      = self::getArgumentValue($arguments,'R', 'report');
-        $cats    = self::getArgumentValue($arguments,'c', 'categories');
-        $message = self::getArgumentValue($arguments,'m', 'message');
+        $ip      = self::getArgumentValue($arguments, 'R', 'report');
+        $cats    = self::getArgumentValue($arguments, 'c', 'categories');
+        $message = self::getArgumentValue($arguments, 'm', 'message');
         
-        self::printTitle(Console::text('  ► Report IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
+        self::printTitle(Console::text('  ► Report IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
         self::printTempMessage();
 
         // Peforms request 
@@ -475,7 +474,7 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($report)){
+        if (self::printErrors($report)) {
             self::printFooter();
             self::safeExit(1);
         }
@@ -484,12 +483,12 @@ 
         $score = empty($report->data->abuseConfidenceScore) ? 0 : $report->data->abuseConfidenceScore;
         $scoreColor = self::getScoreColor($score);
         Console::log(
-            Console::text('   ✓', 'green') . 
-            Console::text(' IP: [', 'white') .
-            Console::text($ip, $scoreColor) .
+            Console::text('   ✓', 'green'). 
+            Console::text(' IP: [', 'white').
+            Console::text($ip, $scoreColor).
             Console::text('] successfully reported', 'white')
         );
-        Console::log(Console::text('     Confidence score: ', 'white') . self::getScoreBadge($score));
+        Console::log(Console::text('     Confidence score: ', 'white').self::getScoreBadge($score));
 
         Console::log();
         self::printFooter($time);
@@ -506,28 +505,28 @@ 
      */
     protected static function bulkReport(array $arguments)
     {
-        $fileName = self::getArgumentValue($arguments,'V', 'bulk-report');
+        $fileName = self::getArgumentValue($arguments, 'V', 'bulk-report');
 
-        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray') . Console::text(escapeshellcmd($fileName), 'white'));
+        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray').Console::text(escapeshellcmd($fileName), 'white'));
         self::printTempMessage();
 
         // Peforms request 
         $timeStart = microtime(true);  
         $response = self::$api->bulkReport($fileName)->getObject();     
         $timeEnd = microtime(true);      
-        $time = $timeEnd - $timeStart;  // request time
+        $time = $timeEnd - $timeStart; // request time
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($response)){
+        if (self::printErrors($response)) {
             self::printFooter();
             self::safeExit(1);
         }
 
         // ✓ Done
         Console::log(
-            Console::text('   Bulk report for file: [', 'white') .
-            Console::text($fileName, 'lightyellow') .
+            Console::text('   Bulk report for file: [', 'white').
+            Console::text($fileName, 'lightyellow').
             Console::text('] done!', 'white')
         );
 
@@ -538,14 +537,14 @@ 
         $savedIcon  = $nbSavedReports > 0 ? '✓' : '✗';
         $errorIcon  = $nbErrorReports > 0 ? '✗' : '✓';
 
-        Console::log(Console::text('   ' . $savedIcon, $savedColor) . self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
-        Console::log(Console::text('   ' . $errorIcon, $errorColor) . self::printResult(' Invalid reports:  ', $nbErrorReports, $errorColor, '', false));
+        Console::log(Console::text('   '.$savedIcon, $savedColor).self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
+        Console::log(Console::text('   '.$errorIcon, $errorColor).self::printResult(' Invalid reports:  ', $nbErrorReports, $errorColor, '', false));
 
-        if ($nbErrorReports > 0){
+        if ($nbErrorReports > 0) {
             $numberDiplayedReports = 0;
             $defaultColor = 'lightyellow'; // reset color for last reports
         
-            foreach ($response->data->invalidReports as $report){
+            foreach ($response->data->invalidReports as $report) {
                 $input = $report->input ? escapeshellcmd($report->input) : ''; // in case on blank line, IP is null
                 $line  = Console::text('      →', 'red');
                 $line .= self::printResult(' Input:         ', $input, $defaultColor, '', false);
@@ -572,29 +571,29 @@ 
      */
     protected static function clearIP(array $arguments)
     {
-        $ip      = self::getArgumentValue($arguments,'E', 'clear');
+        $ip = self::getArgumentValue($arguments, 'E', 'clear');
 
-        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
+        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
 
         // Peforms request 
         self::printTempMessage();
         $timeStart = microtime(true); // request startime 
         $response = self::$api->clearAddress($ip)->getObject();     
-        $timeEnd = microtime(true);  // request end time 
+        $timeEnd = microtime(true); // request end time 
         $time = $timeEnd - $timeStart; // request time
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($response)){
+        if (self::printErrors($response)) {
             self::printFooter($time);
             self::safeExit(1);
         }
 
         // ✓ Done: print deleted report number 
         Console::log(
-            Console::text('   ✓', 'green') . 
-            Console::text(' Successfull clear request for IP: [', 'white') .
-            Console::text($ip, 'lightyellow') .
+            Console::text('   ✓', 'green'). 
+            Console::text(' Successfull clear request for IP: [', 'white').
+            Console::text($ip, 'lightyellow').
             Console::text(']', 'white')
         );
         
@@ -614,42 +613,42 @@ 
      */
     protected static function getBlacklist(array $arguments)
     {
-        $plainText  = self::inArguments($arguments,'p','plaintext');  
+        $plainText = self::inArguments($arguments, 'p', 'plaintext');  
 
-        if (!$plainText){
+        if (!$plainText) {
             self::printTitle(Console::text('  ► Get Blacklist ', 'darkgray'));
         }
 
-        $limit      = self::getNumericParameter($arguments,'l', 'limit', 1000);
-        $scoreMin   = self::getNumericParameter($arguments,'s', 'score', 100);
+        $limit      = self::getNumericParameter($arguments, 'l', 'limit', 1000);
+        $scoreMin   = self::getNumericParameter($arguments, 's', 'score', 100);
 
-        if (!$plainText){
+        if (!$plainText) {
             self::printTempMessage();
         }
 
         // do request 
-        $timeStart = microtime(true);           // request startime 
-        $response = self::$api->blacklist($limit, $plainText, $scoreMin);     // perform request
-        $timeEnd = microtime(true);                         // request end time 
-        $time = $timeEnd - $timeStart;                      // request time
+        $timeStart = microtime(true); // request startime 
+        $response = self::$api->blacklist($limit, $plainText, $scoreMin); // perform request
+        $timeEnd = microtime(true); // request end time 
+        $time = $timeEnd - $timeStart; // request time
 
-        if (!$plainText){
+        if (!$plainText) {
             self::clearTempMessage();
         }
 
         // response could be json on error, while plaintext flag is set
         $decodedResponse = $response->getObject();
         
-        if ($plainText && $response->hasError()){
+        if ($plainText && $response->hasError()) {
             self::safeExit(1);
         }
 
-        if (!$plainText && self::printErrors($decodedResponse)){
+        if (!$plainText && self::printErrors($decodedResponse)) {
             self::printFooter($time);
             self::safeExit(1);
         }
 
-        if ($plainText){
+        if ($plainText) {
             // echo response "as is"
             Console::log($response->getPlaintext());
 
@@ -658,7 +657,7 @@ 
             self::printResult('  List generated at: ', self::getDate($decodedResponse->meta->generatedAt), 'lightyellow', '');
             Console::log();
 
-            foreach ($decodedResponse->data as $report){
+            foreach ($decodedResponse->data as $report) {
                 $score = empty($report->abuseConfidenceScore) ? 0 : $report->abuseConfidenceScore;
                 $defaultColor = self::getScoreColor($score);
 
@@ -687,12 +686,12 @@ 
      */
     protected static function checkBlock($arguments)
     {
-        $network  = self::getArgumentValue($arguments,'K', 'check-block');
+        $network = self::getArgumentValue($arguments, 'K', 'check-block');
 
-        self::printTitle(Console::text('  ► Check network: ', 'darkgray') . Console::text(escapeshellcmd($network), 'white') . Console::text('', 'darkgray'));
+        self::printTitle(Console::text('  ► Check network: ', 'darkgray').Console::text(escapeshellcmd($network), 'white').Console::text('', 'darkgray'));
 
         $maxAge   = self::getNumericParameter($arguments, 'd', 'days', 30);
-        $limit    = self::getNumericParameter($arguments,'l', 'limit', 0); // 0 mean no limit
+        $limit    = self::getNumericParameter($arguments, 'l', 'limit', 0); // 0 mean no limit
 
         self::printTempMessage();
 
@@ -703,7 +702,7 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($check)){
+        if (self::printErrors($check)) {
             self::printFooter($time);
             self::safeExit(1);
         }
@@ -718,18 +717,18 @@ 
         // print reported addresses
         $nbReports = isset($check->data->reportedAddress) ? count($check->data->reportedAddress) : 0;
         
-        if ($nbReports > 0){
+        if ($nbReports > 0) {
             self::printResult(Console::pad('   Reported addresses:', 23), $nbReports, 'lightyellow');
             $numberDiplayedReports = 0;
             $defaultColor = 'lightyellow'; // reset color for last reports
         
-            foreach ($check->data->reportedAddress as $report){
+            foreach ($check->data->reportedAddress as $report) {
                 $score = empty($report->abuseConfidenceScore) ? 0 : $report->abuseConfidenceScore;
                 $defaultColor = self::getScoreColor($score); // color based on score
 
                 $line  = Console::text('   →', $defaultColor);
                 $line .= self::printResult(' IP: ', $report->ipAddress, $defaultColor, '', false);
-                $line .= self::printResult(' Country: ', $report->countryCode , $defaultColor, '', false);
+                $line .= self::printResult(' Country: ', $report->countryCode, $defaultColor, '', false);
                 $line .= Console::text(' | Confidence score: ', 'white');
                 $line .= self::getScoreBadge($score);
                 $line .= self::printResult(' Total reports: ', $report->numReports, $defaultColor, '', false);
@@ -744,7 +743,7 @@ 
                     $line .= Console::text($numberDiplayedReports, 'lightyellow');
                     $line .= Console::text('/', 'white');
                     $line .= Console::text($nbReports, 'lightyellow');
-                    $line .= Console::text($numberDiplayedReports > 1 ? ' IPs displayed)': ' IP displayed)', 'white');
+                    $line .= Console::text($numberDiplayedReports > 1 ? ' IPs displayed)' : ' IP displayed)', 'white');
                     Console::log($line);
                     break;
                 }
@@ -752,8 +751,8 @@ 
 
         } else {
             // no reports
-            $day = $maxAge > 1 ? 'in last '. $maxAge . ' days': ' today';
-            Console::log( Console::text('    ✓', 'green') . Console::text(' No IP reported ' . $day));
+            $day = $maxAge > 1 ? 'in last '.$maxAge.' days' : ' today';
+            Console::log(Console::text('    ✓', 'green').Console::text(' No IP reported '.$day));
         }
 
         // footer
@@ -772,13 +771,13 @@ 
      */
     protected static function checkIP($arguments)
     {
-        $ip                 = self::getArgumentValue($arguments,'C', 'check');
+        $ip = self::getArgumentValue($arguments, 'C', 'check');
 
-        self::printTitle(Console::text('  ► Check IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white') . Console::text('', 'darkgray'));
+        self::printTitle(Console::text('  ► Check IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white').Console::text('', 'darkgray'));
 
-        $verbose            = self::inArguments($arguments,'v', 'verbose');
+        $verbose            = self::inArguments($arguments, 'v', 'verbose');
         $maxAge             = self::getNumericParameter($arguments, 'd', 'days', 30);
-        $maxReportsNumber   = self::getNumericParameter($arguments,'l', 'limit', 10);
+        $maxReportsNumber   = self::getNumericParameter($arguments, 'l', 'limit', 10);
 
         self::printTempMessage();
 
@@ -789,7 +788,7 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($check)){
+        if (self::printErrors($check)) {
             self::printFooter($time);
             self::safeExit(1);
         }
@@ -803,26 +802,26 @@ 
       
 //      self::printResult('   isPublic', $check->data->isPublic, $defaultColor);
 //      self::printResult('   ipVersion', $check->data->ipVersion, $defaultColor);
-        $line = self::printResult(Console::pad('   Whitelisted:', 23), $check->data->isWhitelisted ? 'true': 'false', $defaultColor, '', false);
+        $line = self::printResult(Console::pad('   Whitelisted:', 23), $check->data->isWhitelisted ? 'true' : 'false', $defaultColor, '', false);
         $line .= $check->data->isWhitelisted ? Console::text(' ★', 'green') : ''; 
         Console::log($line);
        
         self::printResult(Console::pad('   Country code:', 23), $check->data->countryCode, $defaultColor);
         
-        if (!empty($check->data->countryName)){
+        if (!empty($check->data->countryName)) {
             self::printResult(Console::pad('   Country name:', 23), $check->data->countryName, $defaultColor);
         }
 
         self::printResult(Console::pad('   ISP:', 23), $check->data->isp, $defaultColor);
 
-        if ($check->data->usageType){
+        if ($check->data->usageType) {
             $line = self::printResult(Console::pad('   Usage type:', 23), $check->data->usageType, $defaultColor, '', false);
             $line .= $check->data->usageType === 'Reserved' ? Console::text(' ◆', 'green') : '';
             Console::log($line);
         }
 
         $hostames = implode(', ', array_filter($check->data->hostnames)) ?? null;
-        if (!empty($hostames)){
+        if (!empty($hostames)) {
             self::printResult(Console::pad('   Hostname(s):', 23), $hostames, $defaultColor);
         }
 
@@ -830,34 +829,34 @@ 
 
         $nbReport = $check->data->totalReports && is_numeric($check->data->totalReports) ? intval($check->data->totalReports) : 0;
         
-        if ($nbReport > 0 ){
+        if ($nbReport > 0) {
             $line  = self::printResult(Console::pad('   Total reports:', 23), $nbReport, $defaultColor, '', false);
             $line .= self::printResult(' from ', $check->data->numDistinctUsers, $defaultColor, '', false);
-            $line .= Console::text($nbReport > 0 ? ' distinct users': ' user', 'white');
+            $line .= Console::text($nbReport > 0 ? ' distinct users' : ' user', 'white');
             Console::log($line);
 
         } else {
             // no reports
-            $day = $maxAge > 1 ? 'in last '. $maxAge . ' days': ' today';
-            Console::log( Console::text('   ✓', 'green') . Console::text(' Not reported ' . $day));
+            $day = $maxAge > 1 ? 'in last '.$maxAge.' days' : ' today';
+            Console::log(Console::text('   ✓', 'green').Console::text(' Not reported '.$day));
         }
         
-        if (!empty($check->data->lastReportedAt)){
+        if (!empty($check->data->lastReportedAt)) {
             self::printResult(Console::pad('   Last reported at:', 23), self::getDate($check->data->lastReportedAt), $defaultColor);
         }
 
         // print last reports
-        if ($verbose){
+        if ($verbose) {
             $nbLastReports = isset($check->data->reports) ? count($check->data->reports) : 0;
             
-            if ($nbLastReports > 0){
+            if ($nbLastReports > 0) {
                 Console::log('   Last reports:', 'white');
                 $numberDiplayedReports = 0;
                 $defaultColor = 'lightyellow'; // reset color for last reports
             
-                foreach ($check->data->reports as $lastReport){
+                foreach ($check->data->reports as $lastReport) {
                     $categories = [];
-                    foreach (array_filter($lastReport->categories) as $catId){
+                    foreach (array_filter($lastReport->categories) as $catId) {
                         $cat = self::$api->getCategoryNamebyId($catId)[0];
                         if ($cat !== false) {
                             $categories[] = $cat;
@@ -867,15 +866,15 @@ 
                     $line  = Console::text('    →', $defaultColor);
                     $line .= self::printResult(' reported at: ', self::getDate($lastReport->reportedAt), $defaultColor, '', false);
               //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
-                    if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)){
+                    if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)) {
                         $line .= Console::text(' from: ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryCode, $defaultColor, '', false);
                         $line .= Console::text(' - ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryName, $defaultColor, '', false);
                     }
-                    $line .= Console::text(' with categor' .  (count($categories) > 1 ? "ies: " : "y: "), 'white');
+                    $line .= Console::text(' with categor'.(count($categories) > 1 ? "ies: " : "y: "), 'white');
                     foreach ($categories as $key => $cat) {
-                        $line .= Console::text($key==0 ? '' : ',' , 'white') . Console::text($cat, $defaultColor);
+                        $line .= Console::text($key == 0 ? '' : ',', 'white').Console::text($cat, $defaultColor);
                     }
                     Console::log($line);
 
@@ -886,7 +885,7 @@ 
                         $line .= Console::text($numberDiplayedReports, $defaultColor);
                         $line .= Console::text('/', 'white');
                         $line .= Console::text($nbLastReports, $defaultColor);
-                        $line .= Console::text($numberDiplayedReports > 1 ? ' reports displayed)': ' report displayed)', 'white');
+                        $line .= Console::text($numberDiplayedReports > 1 ? ' reports displayed)' : ' report displayed)', 'white');
                         Console::log($line);
                         break;
                     }

src/UtilsTrait.php

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,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);
     }
 
     /**

src/ShellUtils.php

Spacing +35 added lines, -35 removed lines

@@ -61,7 +61,7 @@ 
      */
     protected static function printTempMessage()
     {
-        Console::reLog(Console::text('   ? ', 'green') . Console::text('waiting for api response', 'white') . Console::text(' ... ', 'green'));
+        Console::reLog(Console::text('   ? ', 'green').Console::text('waiting for api response', 'white').Console::text(' ... ', 'green'));
     }
 
     /**
@@ -113,14 +113,14 @@ 
     {
         self::printLogo();
         Console::log();
-        Console::log(Console::text('  Kristuff/AbuseIPDB Client version: ', 'darkgray') . Console::text(AbuseIPDBClient::VERSION, 'lightgray'));
-        Console::log(Console::text('  Kristuff/AbuseIPDB Core version:   ', 'darkgray') . Console::text(ApiHandler::VERSION, 'lightgray')); 
+        Console::log(Console::text('  Kristuff/AbuseIPDB Client version: ', 'darkgray').Console::text(AbuseIPDBClient::VERSION, 'lightgray'));
+        Console::log(Console::text('  Kristuff/AbuseIPDB Core version:   ', 'darkgray').Console::text(ApiHandler::VERSION, 'lightgray')); 
         Console::log(Console::text('  --------------------------------------------------', 'darkgray'));    
         //Console::log(Console::text('  __________________________________________________', 'darkgray'));    
         //Console::log();
         //Console::log(Console::text('  --------------------------------------------------', 'darkgray'));    
         Console::log(Console::text('  Released under the MIT licence', 'darkgray'));
-        Console::log(Console::text('  Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray'));
+        Console::log(Console::text('  Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray'));
         Console::log(
             Console::text('  © 2020-2021 Kristuff (', 'darkgray').
             Console::text('https://github.com/kristuff', 'darkgray', 'underlined').
@@ -141,8 +141,8 @@ 
     protected static function printBanner()
     {
         Console::log();    
-        Console::log( Console::text(' Kristuff\AbuseIPDB ', 'darkgray') . Console::text(' ' . AbuseIPDBClient::VERSION . ' ', 'white', 'blue')); 
-        Console::log(Console::text(' Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray')); 
+        Console::log(Console::text(' Kristuff\AbuseIPDB ', 'darkgray').Console::text(' '.AbuseIPDBClient::VERSION.' ', 'white', 'blue')); 
+        Console::log(Console::text(' Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray')); 
         Console::log(' © 2020-2021 Kristuff', 'darkgray'); 
         Console::log();    
     }
@@ -157,19 +157,19 @@ 
      */
     protected static function printFooter(string $requestTime = '')
     {
-        if (!empty($requestTime)){
+        if (!empty($requestTime)) {
             $date_utc = new \DateTime("now", new \DateTimeZone("UTC"));
             Console::log(
-                Console::text('  Request time: ', 'darkgray') . Console::text($requestTime . 's', 'lightgray'). 
-                Console::text(' | UTC time: ', 'darkgray') . Console::text($date_utc->format('Y-m-d H:i:s'), 'lightgray')
+                Console::text('  Request time: ', 'darkgray').Console::text($requestTime.'s', 'lightgray'). 
+                Console::text(' | UTC time: ', 'darkgray').Console::text($date_utc->format('Y-m-d H:i:s'), 'lightgray')
             );
         }
         Console::log(Console::text('  ------------------------------------------------------------------------------------------------------', 'darkgray')); 
         Console::log(
-            Console::text('  Kristuff\AbuseIPDB ', 'darkgray') . 
-            Console::text(AbuseIPDBClient::VERSION, 'lightgray') . 
-            Console::text(' | Made with ', 'darkgray') . 
-            Console::text('♥', 'red') .
+            Console::text('  Kristuff\AbuseIPDB ', 'darkgray'). 
+            Console::text(AbuseIPDBClient::VERSION, 'lightgray'). 
+            Console::text(' | Made with ', 'darkgray'). 
+            Console::text('♥', 'red').
             Console::text(' in France | © 2020-2021 Kristuff (https://github.com/kristuff)', 'darkgray')
         ); 
         Console::log();    
@@ -186,9 +186,9 @@ 
     protected static function printResult($text, $value, string $foregroundColor = 'lightred', string $backgroundColor = '', bool $print = true)
     {
         // do not print null/blank values
-        if (isset($value)){
-            $line = Console::text($text, 'white') . Console::text($value, $foregroundColor, $backgroundColor); 
-            if ($print){
+        if (isset($value)) {
+            $line = Console::text($text, 'white').Console::text($value, $foregroundColor, $backgroundColor); 
+            if ($print) {
                 Console::log($line);
             }
             return $line;
@@ -212,16 +212,16 @@ 
         $scoreforegroundColor = 'white';
         $scoreBackgroundColor = 'green';
 
-        if (intval($score) > 0 ){
+        if (intval($score) > 0) {
             $scoreforegroundColor = 'black';
             $scoreBackgroundColor = 'yellow';
         } 
-        if (intval($score) > 50 ){
+        if (intval($score) > 50) {
             $scoreforegroundColor = 'white';
             $scoreBackgroundColor = 'red';
         } 
   
-        $badge = str_pad($score, 3, ' ',STR_PAD_LEFT); 
+        $badge = str_pad($score, 3, ' ', STR_PAD_LEFT); 
         return Console::text($padding.$badge.$padding, $scoreforegroundColor, $scoreBackgroundColor);
     }
 
@@ -237,27 +237,27 @@ 
      */
     protected static function printErrors($response, bool $checkForEmpty = true)
     {
-        if (isset($response) && isset($response->errors)){
+        if (isset($response) && isset($response->errors)) {
 
             // top error badge    
-            Console::log('  ' .   Console::text(' ERROR ','white', 'red'));
+            Console::log('  '.Console::text(' ERROR ', 'white', 'red'));
 
             $num = 0;
             // errors is an array, could have more than one error..
-            foreach ($response->errors as $err){
+            foreach ($response->errors as $err) {
                 $num++;
 
-                Console::log(Console::text('   ✗', 'red') .  self::printResult(' Number:    ', $num, 'lightyellow','', false));
-                self::printResult('     Status:    ', $err->status ?? null, 'lightyellow','');    
+                Console::log(Console::text('   ✗', 'red').self::printResult(' Number:    ', $num, 'lightyellow', '', false));
+                self::printResult('     Status:    ', $err->status ?? null, 'lightyellow', '');    
                 
-                if (!empty($err->source) && !empty($err->source->parameter)){
+                if (!empty($err->source) && !empty($err->source->parameter)) {
                     self::printResult('     Parameter: ', $err->source->parameter, 'lightyellow');    
                 }
                 self::printResult('     Title:     ', $err->title ?? null, 'lightyellow');    
                 self::printResult('     Detail:    ', $err->detail ?? null, 'lightyellow');    
 
                 // separate errors
-                if (count($response->errors) > 1){
+                if (count($response->errors) > 1) {
                     Console::log('   ---');
                 }
 
@@ -267,7 +267,7 @@ 
         }
 
         // check for empty response ?
-        if ( $checkForEmpty && ( empty($response) || empty($response->data)) ){
+        if ($checkForEmpty && (empty($response) || empty($response->data))) {
             self::error('An unexpected error occurred.');
             return true;
         }
@@ -287,11 +287,11 @@ 
     protected static function error($error)
     {
         // ✗
-        Console::log('  ' .   Console::text(' ERROR ','white', 'red'));
+        Console::log('  '.Console::text(' ERROR ', 'white', 'red'));
         Console::log(
-            Console::text('   ✗', 'red') . 
-            Console::text(' Detail:    ', 'white') . 
-            Console::text($error, 'lightyellow') . 
+            Console::text('   ✗', 'red'). 
+            Console::text(' Detail:    ', 'white'). 
+            Console::text($error, 'lightyellow'). 
             Console::text('', 'white')
         );    
         Console::log();    
@@ -310,7 +310,7 @@ 
      */
     protected static function validate(bool $condition, string $message, bool $print = true)
     {
-        if ( !$condition ){
+        if (!$condition) {
             if ($print) {
                 Console::log();
                 self::error($message);
@@ -334,10 +334,10 @@ 
      */
     protected static function getNumericParameter(array $arguments, string $shortArg, string $longArg, int $defaultValue)
     {
-         if (self::inArguments($arguments,$shortArg, $longArg)){
-            $val = self::getArgumentValue($arguments,$shortArg, $longArg);
+         if (self::inArguments($arguments, $shortArg, $longArg)) {
+            $val = self::getArgumentValue($arguments, $shortArg, $longArg);
 
-            if (!is_numeric($val)){
+            if (!is_numeric($val)) {
                 self::error("Invalid parameter: $longArg must be a numeric value.");
                 self::printFooter();
                 exit(1);