kristuff / abuseipdb-cli

src/CheckBlockTrait.php

Spacing +5 added lines, -5 removed lines

@@ -65,13 +65,13 @@ 
             self::printResult(Console::pad('   Reported addresses:', 23), $nbReports, 'lightyellow');
             $numberDiplayedReports = 0;
                
-            foreach ($response->data->reportedAddress as $report){
+            foreach ($response->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);
@@ -86,7 +86,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;
                 }
@@ -94,8 +94,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));
         }
     }   
 }
\ No newline at end of file

src/CheckTrait.php

Indentation +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
                             
         $line  = Console::text('    →', $defaultColor);
         $line .= self::printResult(' reported at: ', self::getDate($report->reportedAt), $defaultColor, '', false);
-  //    $line .= self::printResult(' by user: ', $report->reporterId, $defaultColor, '', false);
+    //    $line .= self::printResult(' by user: ', $report->reporterId, $defaultColor, '', false);
         if (isset($report->reporterCountryCode) && isset($report->reporterCountryName)){
             $line .= Console::text(' from: ', 'white');
             $line .= self::printResult('', $report->reporterCountryCode, $defaultColor, '', false);
@@ -206,5 +206,5 @@ 
             }
         }
         return $categories;                          
-   }    
+    }    
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
     protected static function printCheckScore(object $response): void
     {
         $score = empty($response->data->abuseConfidenceScore) ? 0 : $response->data->abuseConfidenceScore;
-        $line = Console::text(Console::pad('   Confidence score:', 23), 'white') . self::getScoreBadge($score);
+        $line = Console::text(Console::pad('   Confidence score:', 23), 'white').self::getScoreBadge($score);
         Console::log($line);
     }
 
@@ -59,26 +59,26 @@ 
         //  self::printResult('   isPublic', $response->data->isPublic, $defaultColor);
         //  self::printResult('   ipVersion', $response->data->ipVersion, $defaultColor);
  
-        $line = self::printResult(Console::pad('   Whitelisted:', 23), $response->data->isWhitelisted ? 'true': 'false', $color, '', false);
+        $line = self::printResult(Console::pad('   Whitelisted:', 23), $response->data->isWhitelisted ? 'true' : 'false', $color, '', false);
         $line .= $response->data->isWhitelisted ? Console::text(' ★', 'green') : ''; 
         Console::log($line);
        
         self::printResult(Console::pad('   Country code:', 23), $response->data->countryCode, $color);
         
-        if (!empty($response->data->countryName)){
+        if (!empty($response->data->countryName)) {
             self::printResult(Console::pad('   Country name:', 23), $response->data->countryName, $color);
         }
 
         self::printResult(Console::pad('   ISP:', 23), $response->data->isp, $color);
 
-        if ($response->data->usageType){
+        if ($response->data->usageType) {
             $line = self::printResult(Console::pad('   Usage type:', 23), $response->data->usageType, $color, '', false);
             $line .= $response->data->usageType === 'Reserved' ? Console::text(' ◆', 'green') : '';
             Console::log($line);
         }
 
         $hostames = implode(', ', array_filter($response->data->hostnames)) ?? null;
-        if (!empty($hostames)){
+        if (!empty($hostames)) {
             self::printResult(Console::pad('   Hostname(s):', 23), $hostames, $color);
         }
 
@@ -100,19 +100,19 @@ 
     {
         $nbReport = $response->data->totalReports && is_numeric($response->data->totalReports) ? intval($response->data->totalReports) : 0;
         
-        if ($nbReport > 0 ){
+        if ($nbReport > 0) {
             $line  = self::printResult(Console::pad('   Total reports:', 23), $nbReport, $color, '', false);
             $line .= self::printResult(' from ', $response->data->numDistinctUsers, $color, '', 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($response->data->lastReportedAt)){
+        if (!empty($response->data->lastReportedAt)) {
             self::printResult(Console::pad('   Last reported at:', 23), self::getDate($response->data->lastReportedAt), $color);
         }
     }
@@ -132,12 +132,12 @@ 
     {
         $nbLastReports = isset($response->data->reports) ? count($response->data->reports) : 0;
             
-        if ($nbLastReports > 0){
+        if ($nbLastReports > 0) {
             Console::log('   Last reports:', 'white');
             $numberDiplayedReports = 0;
             $defaultColor = 'lightyellow'; // reset color for last reports
         
-            foreach ($response->data->reports as $report){
+            foreach ($response->data->reports as $report) {
                 self::printLastReport($report);
                 $numberDiplayedReports++;
 
@@ -146,7 +146,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;
                 }
@@ -171,15 +171,15 @@ 
         $line  = Console::text('    →', $defaultColor);
         $line .= self::printResult(' reported at: ', self::getDate($report->reportedAt), $defaultColor, '', false);
   //    $line .= self::printResult(' by user: ', $report->reporterId, $defaultColor, '', false);
-        if (isset($report->reporterCountryCode) && isset($report->reporterCountryName)){
+        if (isset($report->reporterCountryCode) && isset($report->reporterCountryName)) {
             $line .= Console::text(' from: ', 'white');
             $line .= self::printResult('', $report->reporterCountryCode, $defaultColor, '', false);
             $line .= Console::text(' - ', 'white');
             $line .= self::printResult('', $report->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);
     }  
@@ -196,7 +196,7 @@ 
     private static function getLastReportsCategories(object $report): array
     {
         $categories = [];
-        foreach (array_filter($report->categories) as $catId){
+        foreach (array_filter($report->categories) as $catId) {
             $cat = ApiHandler::getCategoryNameById(strval($catId));
             if ($cat !== false) {
                 $categories[] = $cat;

src/ShellErrorHandler.php

Indentation +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
      */
     protected static function getNumericParameter(array $arguments, string $shortArg, string $longArg, int $defaultValue): int
     {
-         if (self::inArguments($arguments,$shortArg, $longArg)){
+            if (self::inArguments($arguments,$shortArg, $longArg)){
             $val = self::getArgumentValue($arguments,$shortArg, $longArg);
 
             if (!is_numeric($val)){

Spacing +21 added lines, -21 removed lines

@@ -56,8 +56,8 @@ 
      */
     private static function parseErrors(?object $response = null): bool
     {
-        if (isset($response) && isset($response->errors)){
-            switch (self::$outputFormat){
+        if (isset($response) && isset($response->errors)) {
+            switch (self::$outputFormat) {
                 case self::OUTPUT_DEFAULT:
                     self::printFormattedErrors($response);
                     break;
@@ -86,24 +86,24 @@ 
     protected static function printFormattedErrors(object $response): void
     {
         // 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('   ---');
             }
         }
@@ -123,11 +123,11 @@ 
     {
         if (self::isDefaultOuput()) {
             // ✗
-            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();
@@ -147,7 +147,7 @@ 
      */
     protected static function validate(bool $condition, string $message, bool $print = true): void
     {
-        if ( !$condition ){
+        if (!$condition) {
             if ($print && self::isDefaultOuput()) {
                 Console::log();
                 self::error($message);
@@ -171,10 +171,10 @@ 
      */
     protected static function getNumericParameter(array $arguments, string $shortArg, string $longArg, int $defaultValue): int
     {
-         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();
                 Program::exit(1);
@@ -195,7 +195,7 @@ 
      */
     protected static function printPlainTextErrors(object $response): void
     {
-        foreach ($response->errors as $err){
+        foreach ($response->errors as $err) {
             $text = 'Error: ';
             $text .= self::getErrorDetail($err, 'title');
             $text .= self::getErrorDetail($err, 'statuts');
@@ -219,11 +219,11 @@ 
      */
     private static function getErrorDetail(object $error, string $field, ?string $parent = null): string
     {
-        if (!empty($parent)){
-            return  !empty($error->$parent) && !empty($error->$parent->$field) ? ' ' . $field . ': ' . $error->$parent->$field : '';
+        if (!empty($parent)) {
+            return  !empty($error->$parent) && !empty($error->$parent->$field) ? ' '.$field.': '.$error->$parent->$field : '';
         }
 
-        return !empty($error->$field) ? ' ' . $field . ': ' . $error->$field : '';
+        return !empty($error->$field) ? ' '.$field.': '.$error->$field : '';
     }
 
     /**
@@ -238,7 +238,7 @@ 
     protected static function checkForEmpty(?object $response = null): bool
     {
         // check for empty response ?
-        if ( empty($response) || empty($response->data) ){
+        if (empty($response) || empty($response->data)) {
             self::error('An unexpected error occurred.');
             return true;
         }

src/UtilsTrait.php

Indentation +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
      */
     protected static function inArguments(array $arguments, string $shortArg, string $longArg): bool
     {
-          return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
+            return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
     }
 
     /** 
@@ -101,7 +101,7 @@ 
      * @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
      */
@@ -109,10 +109,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

Spacing +3 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     protected static function getScoreColor($score): string
     {
         $score = intval($score);
-        return $score > 50 ? 'lightred' : ($score > 0 ? 'yellow' : 'green') ;
+        return $score > 50 ? 'lightred' : ($score > 0 ? 'yellow' : 'green');
     }
 
    
@@ -73,8 +73,7 @@ 
      */
     protected static function getArgumentValue(array $arguments, string $shortArg, string $longArg): string
     {
-        return (array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : 
-               (array_key_exists($longArg, $arguments) ? $arguments[$longArg]  : ''));
+        return (array_key_exists($shortArg, $arguments) ? $arguments[$shortArg] : (array_key_exists($longArg, $arguments) ? $arguments[$longArg] : ''));
     }
 
     /**
@@ -108,7 +107,7 @@ 
     protected static function loadJsonFile(string $filePath, bool $throwError = true): ?object
     {
         // 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');
            }

src/BulkReportTrait.php

Spacing +7 added lines, -7 removed lines

@@ -40,8 +40,8 @@ 
     protected static function printBulkReportDetail(string $fileName): void
     {
         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')
         );
     }
@@ -61,7 +61,7 @@ 
         $nbSavedReports = isset($response->data->savedReports) ? $response->data->savedReports : 0;
         $savedColor = $nbSavedReports > 0 ? 'green' : 'red';
         $savedIcon  = $nbSavedReports > 0 ? '✓' : '✗';
-        Console::log(Console::text('   ' . $savedIcon, $savedColor) . self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
+        Console::log(Console::text('   '.$savedIcon, $savedColor).self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
     }
 
     /**
@@ -80,15 +80,15 @@ 
         $errorColor = $nbErrorReports > 0 ? 'red' : 'green';
         $errorIcon  = $nbErrorReports > 0 ? '✗' : '✓';
 
-        Console::log(Console::text('   ' . $errorIcon, $errorColor) . self::printResult(' Invalid reports:  ', $nbErrorReports, $errorColor, '', 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
-                Console::log(Console::text('      →', 'red') . self::printResult(' Input:         ', $input, $defaultColor, '', false));
+                Console::log(Console::text('      →', 'red').self::printResult(' Input:         ', $input, $defaultColor, '', false));
                 self::printResult('        Error:         ', $report->error, $defaultColor);
                 self::printResult('        Line number:   ', $report->rowNumber, $defaultColor);
                 

src/ShellUtils.php

Spacing +22 added lines, -22 removed lines

@@ -37,17 +37,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
@@ -92,7 +92,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'));
         }
     }
 
@@ -146,11 +146,11 @@ 
         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('  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').
@@ -172,8 +172,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')
@@ -193,19 +193,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(); 
@@ -223,9 +223,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;
@@ -249,16 +249,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/AbuseIPDBClient.php

Indentation +35 added lines, -35 removed lines

@@ -69,51 +69,51 @@
         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::text(']')); 
+                            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::text(']')); 
+                            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::text(']')); 
+                            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::text(']')); 
+                            Console::text('FILE', 'yellow') .
+                            Console::text(' [-o ') . 
+                            Console::text('FORMAT', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -E ') .
-                           Console::text('IP', 'yellow').
-                           Console::text(' [-o ') . 
-                           Console::text('FORMAT', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('IP', '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::text(']')); 
+                            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'));
                            

Spacing +108 added lines, -109 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,57 +129,57 @@ 
         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('   -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');
@@ -201,11 +201,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();   
@@ -226,10 +226,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 = '  ';
@@ -239,17 +239,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');
@@ -268,11 +267,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 
@@ -283,7 +282,7 @@ 
         self::clearTempMessage();
         
         // check for errors / empty response
-        if (self::hasErrors($report)){
+        if (self::hasErrors($report)) {
             self::printFooter();
             Program::exit(1);
         }
@@ -292,14 +291,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));
@@ -325,26 +324,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;
@@ -359,7 +358,7 @@ 
 
             case self::OUTPUT_PLAINTEXT:
                 $nbSavedReports = isset($response->data->savedReports) ? $response->data->savedReports : 0;
-                echo $nbSavedReports . PHP_EOL;
+                echo $nbSavedReports.PHP_EOL;
                 break;
 
         }
@@ -376,8 +375,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();
@@ -388,22 +387,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');
@@ -412,7 +411,7 @@ 
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo ($response->data->numReportsDeleted ?? 0) . PHP_EOL;
+                echo ($response->data->numReportsDeleted ?? 0).PHP_EOL;
                 break;
 
         }
@@ -432,8 +431,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();
         
@@ -448,13 +447,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;
@@ -463,7 +462,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);
 
@@ -498,12 +497,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();
 
@@ -514,19 +513,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;
@@ -535,8 +534,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++;
@@ -560,14 +559,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);                                           
@@ -577,7 +576,7 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::hasErrors($check)){
+        if (self::hasErrors($check)) {
             self::printFooter($time);
             Program::exit(1);
         }
@@ -585,7 +584,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;
@@ -595,7 +594,7 @@ 
                 self::printCheckScore($check);
                 self::printCheckDetail($check, $defaultColor);
                 self::printCheckReports($check, $maxAge, $defaultColor);
-                if ($verbose){
+                if ($verbose) {
                     self::printCheckLastReports($check, $maxReportsNumber);
                 }
                 Console::log();
@@ -603,7 +602,7 @@ 
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo ($check->data->abuseConfidenceScore ?? 0) . PHP_EOL;
+                echo ($check->data->abuseConfidenceScore ?? 0).PHP_EOL;
                 break;
 
         }

src/AbstractClient.php

Spacing +29 added lines, -29 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'];
+    const LONG_ARGUMENTS = ['output:', 'config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'clear:', ' bulk-report:', 'help', 'verbose', 'score:', 'version'];
     
     /**
      * @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();
                 self::setOutputFormat($arguments);                    
                 call_user_func(__NAMESPACE__.'\AbuseIPDBClient::'.$cmd[2], $arguments);
@@ -118,7 +118,7 @@ 
         $given = self::getArgumentValue($arguments, 'o', 'output') ?? 'default';
         $output = empty($given) ? 'default' : $given; 
         self::validate(in_array($output, ['default', 'json', 'plaintext']), 'Invalid output argument given.');
-        self::$outputFormat = $output ;
+        self::$outputFormat = $output;
     }
 
     /**
@@ -134,8 +134,8 @@ 
     protected static function createHandler(): 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)
@@ -145,7 +145,7 @@ 
             $selfIps = self::extractSelfIpsFromConf($mainConfigArray, $localConfigArray);
             $apiKey  = self::extractApiKeyFromConf($mainConfigArray, $localConfigArray);
             
-            self::$api =  new QuietApiHandler($apiKey, $selfIps);
+            self::$api = new QuietApiHandler($apiKey, $selfIps);
         } catch (\Exception $e) {
             self::error($e->getMessage());
             self::printFooter();
@@ -165,10 +165,10 @@ 
      */
     protected static function extractSelfIpsFromConf(array $conf, array $localConf): array
     {
-        if (array_key_exists('self_ips', $localConf)){
+        if (array_key_exists('self_ips', $localConf)) {
             return array_map('trim', explode(',', $localConf['self_ips']));
         }
-        if (array_key_exists('self_ips', $conf)){
+        if (array_key_exists('self_ips', $conf)) {
             return array_map('trim', explode(',', $conf['self_ips']));
         }
         return [];
@@ -187,15 +187,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.');
         }
 
@@ -215,21 +215,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 [];