kristuff / abuseipdb-cli

src/UtilsTrait.php

Indentation +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
      */
     protected static function inArguments(array $arguments, string $shortArg, string $longArg)
     {
-          return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
+            return array_key_exists($shortArg, $arguments) || array_key_exists($longArg, $arguments);
     }
 
     /** 
@@ -99,10 +99,10 @@ 
      *
      * @access public
      * @static
-	 * @param string    $filePath       The file's full path
-	 * @param bool      $throwError     Throw error on true or silent process. Default is true
+     * @param string    $filePath       The file's full path
+     * @param bool      $throwError     Throw error on true or silent process. Default is true
      *  
-	 * @return object|null 
+     * @return object|null 
      * @throws \Exception
      * @throws \LogicException
      */
@@ -110,10 +110,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

@@ -56,7 +56,7 @@ 
     protected static function getScoreColor($score)
     {
         $score = intval($score);
-        return $score > 50 ? 'lightred' : ($score > 0 ? 'yellow' : 'green') ;
+        return $score > 50 ? 'lightred' : ($score > 0 ? 'yellow' : 'green');
     }
 
    
@@ -74,8 +74,7 @@ 
      */
     protected static function getArgumentValue(array $arguments, string $shortArg, string $longArg)
     {
-        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] : ''));
     }
 
     /**
@@ -109,7 +108,7 @@ 
     protected static function loadJsonFile(string $filePath, bool $throwError = true)
     {
         // check file exists
-        if (!file_exists($filePath) || !is_file($filePath)){
+        if (!file_exists($filePath) || !is_file($filePath)) {
            if ($throwError) {
                 throw new \Exception('Config file not found');
            }

src/AbuseIPDBClient.php

Indentation +22 added lines, -22 removed lines

@@ -105,38 +105,38 @@
 
         Console::log(' ' . Console::text('SYNOPSIS:', 'white', 'underline')); 
         Console::log(' ' . Console::text('    abuseipdb -C ') . 
-                           Console::text('IP', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('DAYS', 'yellow') . 
-                           Console::text('] [-v] [-l ') . 
-                           Console::text('LIMIT', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('IP', 'yellow') . 
+                            Console::text(' [-d ') . 
+                            Console::text('DAYS', 'yellow') . 
+                            Console::text('] [-v] [-l ') . 
+                            Console::text('LIMIT', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -K ') . 
-                           Console::text('NETWORK', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('DAYS', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('NETWORK', 'yellow') . 
+                            Console::text(' [-d ') . 
+                            Console::text('DAYS', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -R ' .
-                           Console::text('IP', 'yellow') . ' -c ' .
-                           Console::text('CATEGORIES', 'yellow') . ' -m ' .
-                           Console::text('MESSAGE', 'yellow'))); 
+                            Console::text('IP', 'yellow') . ' -c ' .
+                            Console::text('CATEGORIES', 'yellow') . ' -m ' .
+                            Console::text('MESSAGE', 'yellow'))); 
 
         Console::log(' ' . Console::text('    abuseipdb -V ' .
-                           Console::text('FILE', 'yellow')));
+                            Console::text('FILE', 'yellow')));
 
         Console::log(' ' . Console::text('    abuseipdb -E ' .
-                           Console::text('IP', 'yellow')));
+                            Console::text('IP', 'yellow')));
                            
         Console::log(' ' . Console::text('    abuseipdb -B ') . 
-                           Console::text('[-l ') . 
-                           Console::text('LIMIT', 'yellow') . 
-                           Console::text('] [-s ') . 
-                           Console::text('SCORE', 'yellow') . 
-                           Console::text('] [-p ') . 
-                           Console::text('', 'yellow') . 
-                           Console::text(']')); 
+                            Console::text('[-l ') . 
+                            Console::text('LIMIT', 'yellow') . 
+                            Console::text('] [-s ') . 
+                            Console::text('SCORE', 'yellow') . 
+                            Console::text('] [-p ') . 
+                            Console::text('', 'yellow') . 
+                            Console::text(']')); 
 
         Console::log(' ' . Console::text('    abuseipdb -L | -G | -h | --version'));
                            

Spacing +100 added lines, -101 removed lines

@@ -49,7 +49,7 @@ 
     {
         // required at least one valid argument
         self::$keyPath = $keyPath; 
-        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.');
         if (!self::parseCommand($arguments, $keyPath)) {
             self::error('Invalid arguments. Run abuseipdb --help to get help.');
             self::printFooter();
@@ -70,9 +70,9 @@ 
     {
         self::printTitle(Console::text('  ► Register API key ', 'darkgray'));
         
-        $key = self::getArgumentValue($arguments,'S', 'save-key');
+        $key = self::getArgumentValue($arguments, 'S', 'save-key');
         
-        if (empty($key)){
+        if (empty($key)) {
             self::error('Null or invalid key argument.');
             self::printFooter();
             Program::exit(1);
@@ -80,12 +80,12 @@ 
 
         $data = json_encode(['api_key' => $key]);
        
-        if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false){
+        if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false) {
             self::error('An error occured during writing config file. Make sure to give the appropriate permissions do the config directory.');
             self::printFooter();
             Program::exit(1);
         }
-        Console::log(Console::text('  ✓ ', 'green') . Console::text('Your config key file has been successfully created.', 'white'));
+        Console::log(Console::text('  ✓ ', 'green').Console::text('Your config key file has been successfully created.', 'white'));
         Console::log();   
         self::printFooter();
         Program::exit();
@@ -103,45 +103,45 @@ 
     {
         self::printBanner();
 
-        Console::log(' ' . Console::text('SYNOPSIS:', 'white', 'underline')); 
-        Console::log(' ' . Console::text('    abuseipdb -C ') . 
-                           Console::text('IP', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('DAYS', 'yellow') . 
-                           Console::text('] [-v] [-l ') . 
-                           Console::text('LIMIT', 'yellow') . 
+        Console::log(' '.Console::text('SYNOPSIS:', 'white', 'underline')); 
+        Console::log(' '.Console::text('    abuseipdb -C '). 
+                           Console::text('IP', 'yellow'). 
+                           Console::text(' [-d '). 
+                           Console::text('DAYS', 'yellow'). 
+                           Console::text('] [-v] [-l '). 
+                           Console::text('LIMIT', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -K ') . 
-                           Console::text('NETWORK', 'yellow') . 
-                           Console::text(' [-d ') . 
-                           Console::text('DAYS', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -K '). 
+                           Console::text('NETWORK', 'yellow'). 
+                           Console::text(' [-d '). 
+                           Console::text('DAYS', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -R ' .
-                           Console::text('IP', 'yellow') . ' -c ' .
-                           Console::text('CATEGORIES', 'yellow') . ' -m ' .
+        Console::log(' '.Console::text('    abuseipdb -R '.
+                           Console::text('IP', 'yellow').' -c '.
+                           Console::text('CATEGORIES', 'yellow').' -m '.
                            Console::text('MESSAGE', 'yellow'))); 
 
-        Console::log(' ' . Console::text('    abuseipdb -V ' .
+        Console::log(' '.Console::text('    abuseipdb -V '.
                            Console::text('FILE', 'yellow')));
 
-        Console::log(' ' . Console::text('    abuseipdb -E ' .
+        Console::log(' '.Console::text('    abuseipdb -E '.
                            Console::text('IP', 'yellow')));
                            
-        Console::log(' ' . Console::text('    abuseipdb -B ') . 
-                           Console::text('[-l ') . 
-                           Console::text('LIMIT', 'yellow') . 
-                           Console::text('] [-s ') . 
-                           Console::text('SCORE', 'yellow') . 
-                           Console::text('] [-p ') . 
-                           Console::text('', 'yellow') . 
+        Console::log(' '.Console::text('    abuseipdb -B '). 
+                           Console::text('[-l '). 
+                           Console::text('LIMIT', 'yellow'). 
+                           Console::text('] [-s '). 
+                           Console::text('SCORE', 'yellow'). 
+                           Console::text('] [-p '). 
+                           Console::text('', 'yellow'). 
                            Console::text(']')); 
 
-        Console::log(' ' . Console::text('    abuseipdb -L | -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. If given, all next arguments are ignored.', 'lightgray');
@@ -152,39 +152,39 @@ 
         Console::log(Console::text('   -L, --list', 'white')); 
         Console::log('       Prints the list report categories. If given, all next arguments are ignored.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -C, --check ', 'white') . Console::text('ip', 'yellow', 'underline')); 
+        Console::log(Console::text('   -C, --check ', 'white').Console::text('ip', 'yellow', 'underline')); 
         Console::log('       Performs a check request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -K, --check-block ', 'white') . Console::text('network', 'yellow', 'underline')); 
+        Console::log(Console::text('   -K, --check-block ', 'white').Console::text('network', 'yellow', 'underline')); 
         Console::log('       Performs a check-block request for the given network. A valid subnet (v4 or v6) denoted with ', 'lightgray');
         Console::log('       CIDR notation is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -d, --days ', 'white') . Console::text('days', 'yellow', 'underline')); 
+        Console::log(Console::text('   -d, --days ', 'white').Console::text('days', 'yellow', 'underline')); 
         Console::log('       For a check or check-block request, defines the maxAgeDays. Min is 1, max is 365, default is 30.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -R, --report ', 'white') . Console::text('ip', 'yellow', 'underline')); 
+        Console::log(Console::text('   -R, --report ', 'white').Console::text('ip', 'yellow', 'underline')); 
         Console::log('       Performs a report request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();    
-        Console::log(Console::text('   -V, --bulk-report ', 'white') . Console::text('path', 'yellow', 'underline')); 
+        Console::log(Console::text('   -V, --bulk-report ', 'white').Console::text('path', 'yellow', 'underline')); 
         Console::log('       Performs a bulk-report request sending a csv file. A valid file name or full path is required.', 'lightgray');
         Console::log();    
         Console::log(Console::text('   -E, --clear ', 'white')); 
         Console::log('       Remove own reports for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
         Console::log();
-        Console::log(Console::text('   -c, --categories ', 'white') . Console::text('categories', 'yellow', 'underline')); 
+        Console::log(Console::text('   -c, --categories ', 'white').Console::text('categories', 'yellow', 'underline')); 
         Console::log('       For a report request, defines the report category(ies). Categories must be separate by a comma.', 'lightgray');
         Console::log('       Some categories cannot be used alone. A category can be represented by its shortname or by its', 'lightgray');
-        Console::log(Console::text('       id. Use ','lightgray')  . Console::text('abuseipdb -L', 'white') . Console::text(' to print the categories list.','lightgray'));
+        Console::log(Console::text('       id. Use ', 'lightgray').Console::text('abuseipdb -L', 'white').Console::text(' to print the categories list.', 'lightgray'));
         Console::log();    
-        Console::log(Console::text('   -m, --message ', 'white') . Console::text('message', 'yellow', 'underline')); 
+        Console::log(Console::text('   -m, --message ', 'white').Console::text('message', 'yellow', 'underline')); 
         Console::log('       For a report request, defines the message to send with report. Message is required for all', 'lightgray');
         Console::log('       report requests.', 'lightgray');
         Console::log();
         Console::log(Console::text('   -B, --blacklist ', 'white')); 
         Console::log('       Performs a blacklist request. Default limit is 1000. This limit can ne changed with the', 'lightgray');
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
         Console::log();    
-        Console::log(Console::text('   -l, --limit ', 'white') . Console::text('limit', 'yellow', 'underline')); 
+        Console::log(Console::text('   -l, --limit ', 'white').Console::text('limit', 'yellow', 'underline')); 
         Console::log('       For a blacklist request, defines the limit.', 'lightgray');
         Console::log('       For a check request with verbose flag, sets the max number of last reports displayed. Default is 10', 'lightgray');
         Console::log('       For a check-block request, sets the max number of IPs displayed. Default is 0 (no limit).', 'lightgray');
@@ -199,7 +199,7 @@ 
         Console::log(Console::text('   -v, --verbose ', 'white')); 
         Console::log('       For a check request, display additional fields like the x last reports. This increases ', 'lightgray');
         Console::log(Console::text('       request time and response size. Max number of last reports displayed can be changed with the ', 'lightgray'));
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
         Console::log();    
         Console::log(Console::text('   --version', 'white')); 
         Console::log('       Prints the current version. If given, all next arguments are ignored.', 'lightgray');
@@ -220,11 +220,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();   
@@ -245,10 +245,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 = '  ';
@@ -258,17 +258,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');
@@ -287,11 +286,11 @@ 
      */
     protected static function reportIP(array $arguments)
     {
-        $ip      = self::getArgumentValue($arguments,'R', 'report');
-        $cats    = self::getArgumentValue($arguments,'c', 'categories');
-        $message = self::getArgumentValue($arguments,'m', 'message');
+        $ip      = self::getArgumentValue($arguments, 'R', 'report');
+        $cats    = self::getArgumentValue($arguments, 'c', 'categories');
+        $message = self::getArgumentValue($arguments, 'm', 'message');
         
-        self::printTitle(Console::text('  ► Report IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
+        self::printTitle(Console::text('  ► Report IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
         self::printTempMessage();
 
         // Peforms request 
@@ -302,7 +301,7 @@ 
         self::clearTempMessage();
         
         // check for errors / empty response
-        if (self::printErrors($report)){
+        if (self::printErrors($report)) {
             self::printFooter();
             Program::exit(1);
         }
@@ -311,23 +310,23 @@ 
         $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($ip, $scoreColor) . Console::text('] successfully reported', '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));
+                Console::log(Console::text('     Confidence score: ', 'white').self::getScoreBadge($score));
                 Console::log();
                 self::printFooter($time);
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo $score . PHP_EOL;
+                echo $score.PHP_EOL;
                 break;
 
         }
@@ -344,26 +343,26 @@ 
      */
     protected static function bulkReport(array $arguments)
     {
-        $fileName = self::getArgumentValue($arguments,'V', 'bulk-report');
+        $fileName = self::getArgumentValue($arguments, 'V', 'bulk-report');
 
-        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray') . Console::text(escapeshellcmd($fileName), 'white'));
+        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray').Console::text(escapeshellcmd($fileName), 'white'));
         self::printTempMessage();
 
         // Peforms request 
         $timeStart = microtime(true);  
         $response = self::$api->bulkReport($fileName)->getObject();     
         $timeEnd = microtime(true);      
-        $time = $timeEnd - $timeStart;  // request time
+        $time = $timeEnd - $timeStart; // request time
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($response)){
+        if (self::printErrors($response)) {
             self::printFooter();
             Program::exit(1);
         }
 
         // ✓ Done
-        switch (self::$outputFormat){
+        switch (self::$outputFormat) {
             case self::OUTPUT_JSON:
                 echo json_encode($response, JSON_PRETTY_PRINT);
                 break;
@@ -376,7 +375,7 @@ 
 
             case self::OUTPUT_PLAINTEXT:
                 $nbSavedReports = isset($response->data->savedReports) ? $response->data->savedReports : 0;
-                echo $nbSavedReports . PHP_EOL;
+                echo $nbSavedReports.PHP_EOL;
                 break;
 
         }
@@ -393,8 +392,8 @@ 
      */
     protected static function clearIP(array $arguments)
     {
-        $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();
@@ -405,22 +404,22 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($response)){
+        if (self::printErrors($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');
@@ -429,7 +428,7 @@ 
                 break;
 
             case self::OUTPUT_PLAINTEXT:
-                echo ($response->data->numReportsDeleted ?? 0) . PHP_EOL;
+                echo ($response->data->numReportsDeleted ?? 0).PHP_EOL;
                 break;
 
         }
@@ -449,8 +448,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();
         
@@ -464,13 +463,13 @@ 
     
         // response could be json on error, while plaintext flag is set
         $decodedResponse = $response->getObject();
-        if (self::printErrors($decodedResponse, false)){
+        if (self::printErrors($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($response, JSON_PRETTY_PRINT);
                 break;
@@ -479,7 +478,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);
 
@@ -514,12 +513,12 @@ 
      */
     protected static function checkBlock(array $arguments)
     {
-        $network  = self::getArgumentValue($arguments,'K', 'check-block');
+        $network = self::getArgumentValue($arguments, 'K', 'check-block');
 
-        self::printTitle(Console::text('  ► Check network: ', 'darkgray') . Console::text(escapeshellcmd($network), 'white') . Console::text('', 'darkgray'));
+        self::printTitle(Console::text('  ► Check network: ', 'darkgray').Console::text(escapeshellcmd($network), 'white').Console::text('', 'darkgray'));
 
         $maxAge   = self::getNumericParameter($arguments, 'd', 'days', 30);
-        $limit    = self::getNumericParameter($arguments,'l', 'limit', 0); // 0 mean no limit
+        $limit    = self::getNumericParameter($arguments, 'l', 'limit', 0); // 0 mean no limit
 
         self::printTempMessage();
 
@@ -530,19 +529,19 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($check)){
+        if (self::printErrors($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;
@@ -551,8 +550,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++;
@@ -576,14 +575,14 @@ 
      */
     protected static function checkIP(array $arguments)
     {
-        $ip                 = self::getArgumentValue($arguments,'C', 'check');
+        $ip = self::getArgumentValue($arguments, 'C', 'check');
         
-        self::printTitle(Console::text('  ► Check IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white') . Console::text('', 'darkgray'));
+        self::printTitle(Console::text('  ► Check IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white').Console::text('', 'darkgray'));
         
-        $verbose            = self::inArguments($arguments,'v', 'verbose');
+        $verbose            = self::inArguments($arguments, 'v', 'verbose');
         $maxAge             = self::getNumericParameter($arguments, 'd', 'days', 30);
-        $maxReportsNumber   = self::getNumericParameter($arguments,'l', 'limit', 10);
-        $ip                 = self::getArgumentValue($arguments,'C', 'check');
+        $maxReportsNumber   = self::getNumericParameter($arguments, 'l', 'limit', 10);
+        $ip                 = self::getArgumentValue($arguments, 'C', 'check');
 
         self::printTempMessage();
         $timeStart = microtime(true);                                           
@@ -593,15 +592,15 @@ 
         self::clearTempMessage();
 
         // check for errors / empty response
-        if (self::printErrors($check)){
+        if (self::printErrors($check)) {
             self::printFooter($time);
             Program::exit(1);
         }
 
         // score and data color (depending of abuseConfidenceScore)
-        $score          = empty($check->data->abuseConfidenceScore) ? 0 : $check->data->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;
@@ -617,7 +616,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 +28 added lines, -28 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * @var string      
      */
-    const LONG_ARGUMENTS = ['output:','save-key:', 'config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'clear:','bulk-report:', 'help', 'verbose', 'score:','version'];
+    const LONG_ARGUMENTS = ['output:', 'save-key:', 'config', 'list', 'blacklist', 'check:', 'check-block:', 'days:', 'report:', 'categories:', 'message:', 'limit:', 'clear:', 'bulk-report:', 'help', 'verbose', 'score:', 'version'];
     
     /**
      * @var string
@@ -53,29 +53,29 @@ 
     /**
      * @var string
      */
-    protected static $keyPath = __DIR__ .'/../config/key.json';
+    protected static $keyPath = __DIR__.'/../config/key.json';
 
     /**
      * @var array
      */
     protected static $basicCommands = [
-        ['h',           'help',         'printHelp'],
-        ['version',     'version',      'printVersion'],    // no short arg
-        ['S',           'save-key',     'registerApiKey'],  
+        ['h', 'help', 'printHelp'],
+        ['version', 'version', 'printVersion'], // no short arg
+        ['S', 'save-key', 'registerApiKey'],  
     ];
     
     /**
      * @var array
      */
     protected static $mainCommands = [
-        ['G',           'config',       'printConfig'],
-        ['L',           'list',         'printCategories'],
-        ['C',           'check',        'checkIP'],
-        ['K',           'check-block',  'checkBlock'],
-        ['R',           'report',       'reportIP'],
-        ['V',           'bulk-report',  'bulkReport'],
-        ['B',           'blacklist',    'getBlacklist'],
-        ['E',           'clear',        'clearIP'],
+        ['G', 'config', 'printConfig'],
+        ['L', 'list', 'printCategories'],
+        ['C', 'check', 'checkIP'],
+        ['K', 'check-block', 'checkBlock'],
+        ['R', 'report', 'reportIP'],
+        ['V', 'bulk-report', 'bulkReport'],
+        ['B', 'blacklist', 'getBlacklist'],
+        ['E', 'clear', 'clearIP'],
     ];
 
     /**
@@ -90,17 +90,17 @@ 
      */
     protected static function parseCommand(array $arguments, string $keyPath)
     {
-        foreach( self::$basicCommands as $cmd){
-            if (self::inArguments($arguments, $cmd[0], $cmd[1])){
-                call_user_func(__NAMESPACE__ .'\AbuseIPDBClient::' . $cmd[2], $cmd[2]=== 'registerApiKey' ? $arguments : null);
+        foreach (self::$basicCommands as $cmd) {
+            if (self::inArguments($arguments, $cmd[0], $cmd[1])) {
+                call_user_func(__NAMESPACE__.'\AbuseIPDBClient::'.$cmd[2], $cmd[2] === 'registerApiKey' ? $arguments : 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($keyPath);
                 self::setOutputFormat($arguments);                    
-                call_user_func(__NAMESPACE__ .'\AbuseIPDBClient::' . $cmd[2], $arguments);
+                call_user_func(__NAMESPACE__.'\AbuseIPDBClient::'.$cmd[2], $arguments);
                 return true;
             }
         }
@@ -121,8 +121,8 @@ 
     {
         $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::validate(in_array($output, ['default', 'json', 'plaintext']), 'Invalid output argument given.');
+        self::$outputFormat = $output;
     }
 
     /**
@@ -139,7 +139,7 @@ 
     protected static function createHandler(string $keyPath)
     {
         self::$keyPath = $keyPath; 
-        self::validate( self::checkForInstall(), 'Key file missing.');
+        self::validate(self::checkForInstall(), 'Key file missing.');
         try {
             self::$api = self::fromConfigFile(self::$keyPath);
         } catch (\Exception $e) {
@@ -176,21 +176,21 @@ 
     public static function fromConfigFile(string $configPath)
     {
         // check file exists
-        if (!file_exists($configPath) || !is_file($configPath)){
-            throw new \InvalidArgumentException('The file [' . $configPath . '] does not exist.');
+        if (!file_exists($configPath) || !is_file($configPath)) {
+            throw new \InvalidArgumentException('The file ['.$configPath.'] does not exist.');
         }
 
         // check file is readable
-        if (!is_readable($configPath)){
-            throw new InvalidPermissionException('The file [' . $configPath . '] is not readable.');
+        if (!is_readable($configPath)) {
+            throw new InvalidPermissionException('The file ['.$configPath.'] is not readable.');
         }
 
         $keyConfig = self::loadJsonFile($configPath);
         $selfIps = [];
         
         // Look for other optional config files in the same directory 
-        $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR . 'self_ips.json';
-        if (file_exists($selfIpsConfigPath)){
+        $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.'self_ips.json';
+        if (file_exists($selfIpsConfigPath)) {
             $selfIps = self::loadJsonFile($selfIpsConfigPath)->self_ips;
         }
 

src/BulkReportTrait.php

Spacing +7 added lines, -7 removed lines

@@ -41,8 +41,8 @@ 
     {
         // ✓ Done
         Console::log(
-            Console::text('   Bulk report for file: [', 'white') .
-            Console::text($fileName, 'lightyellow') .
+            Console::text('   Bulk report for file: [', 'white').
+            Console::text($fileName, 'lightyellow').
             Console::text('] done!', 'white')
         );
 
@@ -53,16 +53,16 @@ 
         $savedIcon  = $nbSavedReports > 0 ? '✓' : '✗';
         $errorIcon  = $nbErrorReports > 0 ? '✗' : '✓';
 
-        Console::log(Console::text('   ' . $savedIcon, $savedColor) . self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
-        Console::log(Console::text('   ' . $errorIcon, $errorColor) . self::printResult(' Invalid reports:  ', $nbErrorReports, $errorColor, '', false));
+        Console::log(Console::text('   '.$savedIcon, $savedColor).self::printResult(' Saved reports:    ', $nbSavedReports, $savedColor, '', false));
+        Console::log(Console::text('   '.$errorIcon, $errorColor).self::printResult(' Invalid reports:  ', $nbErrorReports, $errorColor, '', false));
 
-        if ($nbErrorReports > 0){
+        if ($nbErrorReports > 0) {
             $numberDiplayedReports = 0;
             $defaultColor = 'lightyellow'; // reset color for last reports
 
-            foreach ($response->data->invalidReports as $report){
+            foreach ($response->data->invalidReports as $report) {
                 $input = $report->input ? escapeshellcmd($report->input) : ''; // in case on blank line, IP is null
-                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

Indentation +1 added lines, -1 removed lines

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

Spacing +41 added lines, -41 removed lines

@@ -82,7 +82,7 @@ 
     protected static function printTempMessage()
     {
         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'));
         }
     }
 
@@ -140,11 +140,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').
@@ -166,8 +166,8 @@ 
     {
         if (self::isDefaultOuput()) {
             Console::log();    
-            Console::log( Console::text(' Kristuff\AbuseIPDB ', 'darkgray') . Console::text(' ' . AbuseIPDBClient::VERSION . ' ', 'white', 'blue')); 
-            Console::log(Console::text(' Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray')); 
+            Console::log(Console::text(' Kristuff\AbuseIPDB ', 'darkgray').Console::text(' '.AbuseIPDBClient::VERSION.' ', 'white', 'blue')); 
+            Console::log(Console::text(' Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray')); 
             Console::log(' © 2020-2021 Kristuff', 'darkgray'); 
             Console::log();  
         }  
@@ -184,19 +184,19 @@ 
     protected static function printFooter(string $requestTime = '')
     {
         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(); 
@@ -215,9 +215,9 @@ 
     {
         
         // 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;
@@ -241,16 +241,16 @@ 
         $scoreforegroundColor = 'white';
         $scoreBackgroundColor = 'green';
 
-        if (intval($score) > 0 ){
+        if (intval($score) > 0) {
             $scoreforegroundColor = 'black';
             $scoreBackgroundColor = 'yellow';
         } 
-        if (intval($score) > 50 ){
+        if (intval($score) > 50) {
             $scoreforegroundColor = 'white';
             $scoreBackgroundColor = 'red';
         } 
   
-        $badge = str_pad($score, 3, ' ',STR_PAD_LEFT); 
+        $badge = str_pad($score, 3, ' ', STR_PAD_LEFT); 
         return Console::text($padding.$badge.$padding, $scoreforegroundColor, $scoreBackgroundColor);
     }
 
@@ -266,29 +266,29 @@ 
      */
     protected static function printErrors($response, bool $checkForEmpty = true)
     {
-        if (isset($response) && isset($response->errors)){
+        if (isset($response) && isset($response->errors)) {
 
-            switch (self::$outputFormat){
+            switch (self::$outputFormat) {
                 case self::OUTPUT_DEFAULT:
                     // 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('   ---');
                         }
 
@@ -297,12 +297,12 @@ 
                     break;
 
                 case self::OUTPUT_PLAINTEXT:
-                    foreach ($response->errors as $err){
+                    foreach ($response->errors as $err) {
                         $text = 'Error: ';
-                        $text .= !empty($err->title) ? ' title: ' . $err->title : '';
-                        $text .= !empty($err->status) ? ' status: ' . $err->status : '';
-                        $text .= !empty($err->source) && !empty($err->source->parameter) ? ' parameter: ' . $err->source->parameter : '';
-                        $text .= !empty($err->detail) ? ' detail: ' . $err->detail : '';
+                        $text .= !empty($err->title) ? ' title: '.$err->title : '';
+                        $text .= !empty($err->status) ? ' status: '.$err->status : '';
+                        $text .= !empty($err->source) && !empty($err->source->parameter) ? ' parameter: '.$err->source->parameter : '';
+                        $text .= !empty($err->detail) ? ' detail: '.$err->detail : '';
                         $text .= PHP_EOL;
                         echo $text;
                     }                
@@ -317,7 +317,7 @@ 
         }
 
         // check for empty response ?
-        if ( $checkForEmpty && ( empty($response) || empty($response->data)) ){
+        if ($checkForEmpty && (empty($response) || empty($response->data))) {
             self::error('An unexpected error occurred.');
             return true;
         }
@@ -338,11 +338,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();
@@ -362,7 +362,7 @@ 
      */
     protected static function validate(bool $condition, string $message, bool $print = true)
     {
-        if ( !$condition ){
+        if (!$condition) {
             if ($print && self::isDefaultOuput()) {
                 Console::log();
                 self::error($message);
@@ -386,10 +386,10 @@ 
      */
     protected static function getNumericParameter(array $arguments, string $shortArg, string $longArg, int $defaultValue)
     {
-         if (self::inArguments($arguments,$shortArg, $longArg)){
-            $val = self::getArgumentValue($arguments,$shortArg, $longArg);
+         if (self::inArguments($arguments, $shortArg, $longArg)) {
+            $val = self::getArgumentValue($arguments, $shortArg, $longArg);
 
-            if (!is_numeric($val)){
+            if (!is_numeric($val)) {
                 self::error("Invalid parameter: $longArg must be a numeric value.");
                 self::printFooter();
                 Program::exit(1);

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 +3 added lines, -3 removed lines

@@ -131,8 +131,8 @@ 
      */
     protected static function printCheckLastReports(object $response, bool $verbose, int $maxReportsNumber)
     {
-         // print last reports
-         if ($verbose){
+            // print last reports
+            if ($verbose){
             $nbLastReports = isset($response->data->reports) ? count($response->data->reports) : 0;
             
             if ($nbLastReports > 0){
@@ -151,7 +151,7 @@ 
 
                     $line  = Console::text('    →', $defaultColor);
                     $line .= self::printResult(' reported at: ', self::getDate($lastReport->reportedAt), $defaultColor, '', false);
-              //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
+                //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
                     if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)){
                         $line .= Console::text(' from: ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryCode, $defaultColor, '', false);

Spacing +18 added lines, -18 removed lines

@@ -41,7 +41,7 @@ 
     protected static function printCheckScore(object $response)
     {
         $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);
     }
 
@@ -60,26 +60,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);
         }
 
@@ -101,19 +101,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,17 +132,17 @@ 
     protected static function printCheckLastReports(object $response, bool $verbose, int $maxReportsNumber)
     {
          // print last reports
-         if ($verbose){
+         if ($verbose) {
             $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 $lastReport){
+                foreach ($response->data->reports as $lastReport) {
                     $categories = [];
-                    foreach (array_filter($lastReport->categories) as $catId){
+                    foreach (array_filter($lastReport->categories) as $catId) {
                         $cat = ApiHandler::getCategoryNamebyId($catId)[0];
                         if ($cat !== false) {
                             $categories[] = $cat;
@@ -152,15 +152,15 @@ 
                     $line  = Console::text('    →', $defaultColor);
                     $line .= self::printResult(' reported at: ', self::getDate($lastReport->reportedAt), $defaultColor, '', false);
               //    $line .= self::printResult(' by user: ', $lastReport->reporterId, $defaultColor, '', false);
-                    if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)){
+                    if (isset($lastReport->reporterCountryCode) && isset($lastReport->reporterCountryName)) {
                         $line .= Console::text(' from: ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryCode, $defaultColor, '', false);
                         $line .= Console::text(' - ', 'white');
                         $line .= self::printResult('', $lastReport->reporterCountryName, $defaultColor, '', false);
                     }
-                    $line .= Console::text(' with categor' .  (count($categories) > 1 ? "ies: " : "y: "), 'white');
+                    $line .= Console::text(' with categor'.(count($categories) > 1 ? "ies: " : "y: "), 'white');
                     foreach ($categories as $key => $cat) {
-                        $line .= Console::text($key==0 ? '' : ',' , 'white') . Console::text($cat, $defaultColor);
+                        $line .= Console::text($key == 0 ? '' : ',', 'white').Console::text($cat, $defaultColor);
                     }
                     Console::log($line);
 
@@ -171,7 +171,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;
                     }