kristuff / abuseipdb-cli

src/AbuseIPDBClient.php

Spacing +110 added lines, -111 removed lines

@@ -46,7 +46,7 @@ 
     public static function start(array $arguments, string $confPath): void
     {
         // 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.');
         self::$configPath = $confPath; 
         if (!self::parseCommand($arguments, $confPath)) {
             self::error('Invalid arguments. Run abuseipdb --help to get help.');
@@ -67,58 +67,58 @@ 
     protected static function printHelp(): void
     {
         Console::log();
-        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('] [-o ') . 
-                           Console::text('FORMAT', '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('] [-o '). 
+                           Console::text('FORMAT', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -K ') . 
-                           Console::text('NETWORK', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('DAYS', 'yellow') . 
-                           Console::text('] [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -K '). 
+                           Console::text('NETWORK', 'yellow'). 
+                           Console::text(' [-d '). 
+                           Console::text('DAYS', 'yellow'). 
+                           Console::text('] [-o '). 
+                           Console::text('FORMAT', '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(' [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -R ').
+                           Console::text('IP', 'yellow').' -c '.
+                           Console::text('CATEGORIES', 'yellow').' -m '.
+                           Console::text('MESSAGE', 'yellow').
+                           Console::text(' [-o '). 
+                           Console::text('FORMAT', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -V ') .
-                           Console::text('FILE', 'yellow') .
-                           Console::text(' [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -V ').
+                           Console::text('FILE', 'yellow').
+                           Console::text(' [-o '). 
+                           Console::text('FORMAT', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -E ') .
+        Console::log(' '.Console::text('    abuseipdb -E ').
                            Console::text('IP', 'yellow').
-                           Console::text(' [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
+                           Console::text(' [-o '). 
+                           Console::text('FORMAT', 'yellow'). 
                            Console::text(']')); 
                            
-        Console::log(' ' . Console::text('    abuseipdb -B ') . 
-                           Console::text('[-l ') . 
-                           Console::text('LIMIT', 'yellow') . 
-                           Console::text('] [-s ') . 
-                           Console::text('SCORE', 'yellow') . 
-                           Console::text('] [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -B '). 
+                           Console::text('[-l '). 
+                           Console::text('LIMIT', 'yellow'). 
+                           Console::text('] [-s '). 
+                           Console::text('SCORE', 'yellow'). 
+                           Console::text('] [-o '). 
+                           Console::text('FORMAT', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -L | -G | -h | --version'));
+        Console::log(' '.Console::text('    abuseipdb -L | -G | -h | --version'));
                            
         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.', 'lightgray');
@@ -129,61 +129,61 @@ 
         Console::log(Console::text('   -L, --list', 'white')); 
         Console::log('       Prints the list report categories.', '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('FILE', 'yellow', 'underline')); 
+        Console::log(Console::text('   -V, --bulk-report ', 'white').Console::text('FILE', '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');
         Console::log();    
-        Console::log(Console::text('   -o, --output ', 'white') . Console::text('FORMAT', 'yellow', 'underline')); 
+        Console::log(Console::text('   -o, --output ', 'white').Console::text('FORMAT', 'yellow', 'underline')); 
         Console::log('       Defines the output format for API requests. Default is a colorized report, possible formats are', 'lightgray');
-        Console::log('       '. Console::text('json', 'yellow', 'underline') . ' or ' . Console::text('plaintext', 'yellow', 'underline') . '. Plaintext option prints partial response (blacklist: IPs list, ');
+        Console::log('       '.Console::text('json', 'yellow', 'underline').' or '.Console::text('plaintext', 'yellow', 'underline').'. Plaintext option prints partial response (blacklist: IPs list, ');
         Console::log('       check or report: confidence score only, check-block: reported IPs list with confidence score, ', 'lightgray');
         Console::log('       bulk-report: number of saved reports, clear: number of deleted reports).', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -s, --score ', 'white'). Console::text('SCORE', 'yellow', 'underline')); 
+        Console::log(Console::text('   -s, --score ', 'white').Console::text('SCORE', 'yellow', 'underline')); 
         Console::log('       For a blacklist request, sets the confidence score minimum. The confidence minimum ', 'lightgray');
         Console::log('       must be between 25 and 100. This parameter is subscriber feature (not honored otherwise, allways 100).', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -t, --timeout ', 'white'). Console::text('TIMEOUT', 'yellow', 'underline')); 
+        Console::log(Console::text('   -t, --timeout ', 'white').Console::text('TIMEOUT', 'yellow', 'underline')); 
         Console::log('       Define the timeout in API request and overwrite the value defined in conf.ini or local.ini.', 'lightgray');
         Console::log('       Timeout is expressed in milliseconds.', 'lightgray');
         Console::log();    
         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.', 'lightgray');
@@ -205,12 +205,12 @@ 
 
         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('  timeout:[', 'white') . Console::text($conf['timeout'], 'green') . Console::text(']', 'white'));
+        Console::log(Console::text('  api_key:[', 'white').Console::text($conf['apiKey'], 'green').Console::text(']', 'white'));
+        Console::log(Console::text('  timeout:[', 'white').Console::text($conf['timeout'], '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();   
@@ -231,10 +231,10 @@ 
 
         $categories = ApiHandler::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 = '  ';
@@ -244,17 +244,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');
@@ -273,11 +272,11 @@ 
      */
     protected static function reportIP(array $arguments): void
     {
-        $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 
@@ -288,7 +287,7 @@ 
         self::clearTempMessage();
         
         // check for errors / empty response
-        if (self::hasErrors($report)){
+        if (self::hasErrors($report)) {
             self::printFooter();
             Program::exit(1);
         }
@@ -297,14 +296,14 @@ 
         $score = empty($report->data->abuseConfidenceScore) ? 0 : $report->data->abuseConfidenceScore;
         $scoreColor = self::getScoreColor($score);
 
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($report, JSON_PRETTY_PRINT);
                 break;
        
             case self::OUTPUT_DEFAULT:  
                 Console::log(
-                    Console::text('   ✓', 'green').Console::text(' IP: [', 'white') .
+                    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));
@@ -330,26 +329,26 @@ 
      */
     protected static function bulkReport(array $arguments): void
     {
-        $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::hasErrors($response)){
+        if (self::hasErrors($response)) {
             self::printFooter();
             Program::exit(1);
         }
 
         // ✓ Done
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($response, JSON_PRETTY_PRINT);
                 break;
@@ -364,7 +363,7 @@ 
 
             case self::OUTPUT_PLAINTEXT:
                 $nbSavedReports = isset($response->data->savedReports) ? $response->data->savedReports : 0;
-                echo $nbSavedReports . PHP_EOL;
+                echo $nbSavedReports.PHP_EOL;
                 break;
 
         }
@@ -381,8 +380,8 @@ 
      */
     protected static function clearIP(array $arguments): void
     {
-        $ip = self::getArgumentValue($arguments,'E', 'clear');
-        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
+        $ip = self::getArgumentValue($arguments, 'E', 'clear');
+        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
 
         // Peforms request 
         self::printTempMessage();
@@ -393,22 +392,22 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::hasErrors($response)){
+        if (self::hasErrors($response)) {
             self::printFooter($time);
             Program::exit(1);
         }
         
         // ✓ Done: print deleted report number 
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($response, JSON_PRETTY_PRINT);
                 break;
        
             case self::OUTPUT_DEFAULT:  
                 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')
                 );
                 self::printResult('     Deleted reports: ', $response->data->numReportsDeleted ?? 0, 'lightyellow');
@@ -417,7 +416,7 @@ 
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo ($response->data->numReportsDeleted ?? 0) . PHP_EOL;
+                echo ($response->data->numReportsDeleted ?? 0).PHP_EOL;
                 break;
 
         }
@@ -437,8 +436,8 @@ 
         self::printTitle(Console::text('  ► Get Blacklist ', 'darkgray'));
 
         $plainText  = (self::$outputFormat === self::OUTPUT_PLAINTEXT); 
-        $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);
         
         self::printTempMessage();
         
@@ -453,13 +452,13 @@ 
         // response could be json on error, while plaintext flag is set
         $decodedResponse = $response->getObject();
 
-        if (self::hasErrors($decodedResponse, false)){
+        if (self::hasErrors($decodedResponse, false)) {
             self::printFooter($time);
             Program::exit(1);
         }
 
         // ✓ Done: print deleted report number 
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($decodedResponse, JSON_PRETTY_PRINT);
                 break;
@@ -468,7 +467,7 @@ 
                  // print list
                 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);
 
@@ -503,12 +502,12 @@ 
      */
     protected static function checkBlock(array $arguments): void
     {
-        $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();
 
@@ -519,19 +518,19 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::hasErrors($check)){
+        if (self::hasErrors($check)) {
             self::printFooter($time);
             Program::exit(1);
         }
 
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($check, JSON_PRETTY_PRINT);
                 break;
        
             case self::OUTPUT_DEFAULT:  
                 self::printCheckBlockDetail($check);
-                self::printCheckBlockReportedIP($check,$maxAge,$limit);
+                self::printCheckBlockReportedIP($check, $maxAge, $limit);
                 Console::log();
                 self::printFooter($time);
                 break;
@@ -540,8 +539,8 @@ 
                 $nbReports = isset($check->data->reportedAddress) ? count($check->data->reportedAddress) : 0;
                 if ($nbReports > 0) {
                     $numberDiplayedReports = 0;
-                    foreach ($check->data->reportedAddress as $report){
-                        echo ($report->ipAddress) . ' ' . $report->abuseConfidenceScore . PHP_EOL;
+                    foreach ($check->data->reportedAddress as $report) {
+                        echo ($report->ipAddress).' '.$report->abuseConfidenceScore.PHP_EOL;
 
                         // counter
                         $numberDiplayedReports++;
@@ -565,14 +564,14 @@ 
      */
     protected static function checkIP(array $arguments): void
     {
-        $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);
-        $ip                 = self::getArgumentValue($arguments,'C', 'check');
+        $maxReportsNumber   = self::getNumericParameter($arguments, 'l', 'limit', 10);
+        $ip                 = self::getArgumentValue($arguments, 'C', 'check');
 
         self::printTempMessage();
         $timeStart = microtime(true);                                           
@@ -582,7 +581,7 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::hasErrors($check)){
+        if (self::hasErrors($check)) {
             self::printFooter($time);
             Program::exit(1);
         }
@@ -590,7 +589,7 @@ 
         // score and data color (depending of abuseConfidenceScore)
         $score = empty($check->data->abuseConfidenceScore) ? 0 : $check->data->abuseConfidenceScore;
 
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($check, JSON_PRETTY_PRINT);
                 break;
@@ -600,7 +599,7 @@ 
                 self::printCheckScore($check);
                 self::printCheckDetail($check, $defaultColor);
                 self::printCheckReports($check, $maxAge, $defaultColor);
-                if ($verbose){
+                if ($verbose) {
                     self::printCheckLastReports($check, $maxReportsNumber);
                 }
                 Console::log();
@@ -608,7 +607,7 @@ 
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo ($check->data->abuseConfidenceScore ?? 0) . PHP_EOL;
+                echo ($check->data->abuseConfidenceScore ?? 0).PHP_EOL;
                 break;
 
         }

src/ShellUtils.php

Spacing +22 added lines, -22 removed lines

@@ -36,17 +36,17 @@ 
     /**
      * @var string      
      */
-    const OUTPUT_JSON       = 'json';
+    const OUTPUT_JSON = 'json';
 
     /**
      * @var string      
      */
-    const OUTPUT_DEFAULT    = 'default';
+    const OUTPUT_DEFAULT = 'default';
 
     /**
      * @var string      
      */
-    const OUTPUT_PLAINTEXT  = 'plaintext';
+    const OUTPUT_PLAINTEXT = 'plaintext';
     
     /**
      * @var string      $outputFormat
@@ -91,7 +91,7 @@ 
     protected static function printTempMessage(): void
     {
         if (self::isDefaultOuput()) {
-            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'));
         }
     }
 
@@ -145,10 +145,10 @@ 
         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('  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').
@@ -170,8 +170,8 @@ 
     {
         if (self::isDefaultOuput()) {
             Console::log();    
-            Console::log( Console::text(' Kristuff/AbuseIPDB-client ', '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-client ', '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(' © 2020-2021 Kristuff (', 'darkgray').
                 Console::text('https://github.com/kristuff', 'darkgray', 'underlined').
                 Console::text(')', 'darkgray')
@@ -191,19 +191,19 @@ 
     protected static function printFooter($requestTime = ''): void
     {
         if (self::isDefaultOuput()) {
-            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(); 
@@ -221,9 +221,9 @@ 
     protected static function printResult($text, $value, string $foregroundColor = 'lightred', string $backgroundColor = '', bool $print = true): string
     {
         // do not print null/blank values
-        if (isset($value)){
-            $line = Console::text($text, 'white') . Console::text($value, $foregroundColor, $backgroundColor); 
-            if ($print && self::isDefaultOuput()){
+        if (isset($value)) {
+            $line = Console::text($text, 'white').Console::text($value, $foregroundColor, $backgroundColor); 
+            if ($print && self::isDefaultOuput()) {
                 Console::log($line);
             }
             return $line;
@@ -247,16 +247,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(strval($score), 3, ' ',STR_PAD_LEFT); 
+        $badge = str_pad(strval($score), 3, ' ', STR_PAD_LEFT); 
         return Console::text($padding.$badge.$padding, $scoreforegroundColor, $scoreBackgroundColor);
     }
 }
\ No newline at end of file

src/AbstractClient.php

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * @var string      
      */
-    const LONG_ARGUMENTS = ['output:', 'config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'clear:',' bulk-report:', 'help', 'verbose', 'score:', 'version', 'timeout:'];
+    const LONG_ARGUMENTS = ['output:', 'config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'clear:', ' bulk-report:', 'help', 'verbose', 'score:', 'version', 'timeout:'];
     
     /**
      * @var string
@@ -57,22 +57,22 @@ 
      * @var array
      */
     protected static $basicCommands = [
-        ['h',           'help',         'printHelp'],
-        ['version',     'version',      'printVersion'],    // no short arg
-        ['L',           'list',         'printCategories'],
+        ['h', 'help', 'printHelp'],
+        ['version', 'version', 'printVersion'], // no short arg
+        ['L', 'list', 'printCategories'],
     ];
     
     /**
      * @var array
      */
     protected static $mainCommands = [
-        ['G',           'config',       'printConfig'], // require handler 
-        ['C',           'check',        'checkIP'],
-        ['K',           'check-block',  'checkBlock'],
-        ['R',           'report',       'reportIP'],
-        ['V',           'bulk-report',  'bulkReport'],
-        ['B',           'blacklist',    'getBlacklist'],
-        ['E',           'clear',        'clearIP'],
+        ['G', 'config', 'printConfig'], // require handler 
+        ['C', 'check', 'checkIP'],
+        ['K', 'check-block', 'checkBlock'],
+        ['R', 'report', 'reportIP'],
+        ['V', 'bulk-report', 'bulkReport'],
+        ['B', 'blacklist', 'getBlacklist'],
+        ['E', 'clear', 'clearIP'],
     ];
 
     /**
@@ -86,14 +86,14 @@ 
      */
     protected static function parseCommand(array $arguments): bool
     {
-        foreach(self::$basicCommands as $cmd){
-            if (self::inArguments($arguments, $cmd[0], $cmd[1])){
+        foreach (self::$basicCommands as $cmd) {
+            if (self::inArguments($arguments, $cmd[0], $cmd[1])) {
                 call_user_func(__NAMESPACE__.'\AbuseIPDBClient::'.$cmd[2], null);
                 return true;
             }
         }
-        foreach(self::$mainCommands as $cmd){
-            if (self::inArguments($arguments, $cmd[0], $cmd[1])){
+        foreach (self::$mainCommands as $cmd) {
+            if (self::inArguments($arguments, $cmd[0], $cmd[1])) {
                 self::createHandler($arguments);
                 self::setOutputFormat($arguments);                    
                 call_user_func(__NAMESPACE__.'\AbuseIPDBClient::'.$cmd[2], $arguments);
@@ -132,8 +132,8 @@ 
     protected static function createHandler(array $arguments): void
     {
         try {
-            $mainConfPath  = self::$configPath . DIRECTORY_SEPARATOR . 'conf.ini';
-            $localConfPath = self::$configPath . DIRECTORY_SEPARATOR . 'local.ini';
+            $mainConfPath  = self::$configPath.DIRECTORY_SEPARATOR.'conf.ini';
+            $localConfPath = self::$configPath.DIRECTORY_SEPARATOR.'local.ini';
 
             // Check main file exists and is readable
             // Even if a local file exists, main file must be here (throws ex otherwise)
@@ -142,18 +142,18 @@ 
 
             $selfIps = self::extractSelfIpsFromConf($mainConfigArray, $localConfigArray);
             $apiKey  = self::extractApiKeyFromConf($mainConfigArray, $localConfigArray);
-            $timeout = self::extractNumericFromConf('timeout',$mainConfigArray, $localConfigArray, 0);
+            $timeout = self::extractNumericFromConf('timeout', $mainConfigArray, $localConfigArray, 0);
             
             // look into arguments for possible overwrite for timeout 
-            if (self::inArguments($arguments, 't', 'timeout')){
+            if (self::inArguments($arguments, 't', 'timeout')) {
                 $timeout = self::getArgumentValue($arguments, 't', 'timeout');
             }
 
-            if (!is_numeric($timeout)){
+            if (!is_numeric($timeout)) {
                 throw new \RuntimeException('Invalid timeout argument, must be numeric.');
             }            
 
-            self::$api =  new QuietApiHandler($apiKey, $selfIps, intval($timeout));
+            self::$api = new QuietApiHandler($apiKey, $selfIps, intval($timeout));
         } catch (\Exception $e) {
             self::error($e->getMessage());
             self::printFooter();
@@ -173,10 +173,10 @@ 
      */
     protected static function extractSelfIpsFromConf(array $conf, array $localConf): array
     {
-        if (array_key_exists('self_ips', $localConf) && !empty($localConf['self_ips'])){
+        if (array_key_exists('self_ips', $localConf) && !empty($localConf['self_ips'])) {
             return array_map('trim', explode(',', $localConf['self_ips']));
         }
-        if (array_key_exists('self_ips', $conf) && !empty($conf['self_ips'])){
+        if (array_key_exists('self_ips', $conf) && !empty($conf['self_ips'])) {
             return array_map('trim', explode(',', $conf['self_ips']));
         }
         return [];
@@ -197,15 +197,15 @@ 
     {
         $key = '';
 
-        if (array_key_exists('api_key', $localConf)){
+        if (array_key_exists('api_key', $localConf)) {
             $key = $localConf['api_key'];
         }
         
-        if (empty($key) && array_key_exists('api_key', $conf)){
+        if (empty($key) && array_key_exists('api_key', $conf)) {
             $key = $conf['api_key'];
         }
 
-        if (empty($key)){
+        if (empty($key)) {
             throw new \RuntimeException('Api key is missing.');
         }
 
@@ -226,11 +226,11 @@ 
      */
     protected static function extractNumericFromConf(string $key, array $conf, array $localConf, int $default): int
     {
-        if (array_key_exists($key, $localConf) && is_numeric($localConf[$key])){
+        if (array_key_exists($key, $localConf) && is_numeric($localConf[$key])) {
             return intval($localConf[$key]);
         }
         
-        if (array_key_exists($key, $conf) && is_numeric($conf[$key])){
+        if (array_key_exists($key, $conf) && is_numeric($conf[$key])) {
             return intval($conf[$key]);
         }
 
@@ -250,21 +250,21 @@ 
      */
     protected static function loadConfigFile(string $path, bool $mandatory = false): array
     {
-        if (file_exists($path) && is_file($path)){
+        if (file_exists($path) && is_file($path)) {
 
             // If main file or a local file is not readable then throws ex.
-            if (!is_readable($path)){
+            if (!is_readable($path)) {
                 throw new \RuntimeException('The configuration file ['.$path.'] is not readable.');
             }
 
-            $conf = parse_ini_file($path, false);  // load without sections...
-            if ($conf === false){
+            $conf = parse_ini_file($path, false); // load without sections...
+            if ($conf === false) {
                 throw new \RuntimeException('Unable to read configuration file ['.$path.'].');
             }
             return $conf;
         }
 
-        if ($mandatory){
+        if ($mandatory) {
             throw new \RuntimeException('The configuration file ['.$path.'] does not exist.');
         }
         return [];