kristuff / abuseipdb-cli

src/CheckTrait.php

Spacing +19 added lines, -19 removed lines

@@ -39,7 +39,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);
     }
 
@@ -58,26 +58,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);
         }
 
@@ -99,28 +99,28 @@ 
     {
         $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
-            $period = $maxAge > 1 ? 'in last '. $maxAge . ' days': ' today';
-            if (empty($response->data->lastReportedAt)){
-                Console::log( Console::text('   ✓', 'green') . Console::text(' Not reported ' . $period));
+            $period = $maxAge > 1 ? 'in last '.$maxAge.' days' : ' today';
+            if (empty($response->data->lastReportedAt)) {
+                Console::log(Console::text('   ✓', 'green').Console::text(' Not reported '.$period));
             
             } else {
                 // in some case, we have no reports but lastReportedAt in not empty (when deleting reports for example)
                 // maybe a bug or cache in api 
                 // In this case Set total 0 and let print lastReportedAt
-                $line  = self::printResult(Console::pad('   Total reports:', 23), $nbReport, $color, '', false);
+                $line = self::printResult(Console::pad('   Total reports:', 23), $nbReport, $color, '', false);
                 Console::log($line);
             }
         }
         
-        if (!empty($response->data->lastReportedAt)){
+        if (!empty($response->data->lastReportedAt)) {
             self::printResult(Console::pad('   Last reported at:', 23), self::getDate($response->data->lastReportedAt), $color);
         }
     }
@@ -140,12 +140,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++;
 
@@ -154,7 +154,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;
                 }
@@ -179,15 +179,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);
     }  
@@ -204,7 +204,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/ShellUtils.php

Spacing +22 added lines, -22 removed lines

@@ -36,17 +36,17 @@ 
     /**
      * @var string      
      */
-    const OUTPUT_JSON       = 'json';
+    const OUTPUT_JSON = 'json';
 
     /**
      * @var string      
      */
-    const OUTPUT_DEFAULT    = 'default';
+    const OUTPUT_DEFAULT = 'default';
 
     /**
      * @var string      
      */
-    const OUTPUT_PLAINTEXT  = 'plaintext';
+    const OUTPUT_PLAINTEXT = 'plaintext';
     
     /**
      * @var string      $outputFormat
@@ -91,7 +91,7 @@ 
     protected static function printTempMessage(): void
     {
         if (self::isDefaultOuput()) {
-            Console::reLog(Console::text('   ? ', 'green') . Console::text('waiting for api response', 'white') . Console::text(' ... ', 'green'));
+            Console::reLog(Console::text('   ? ', 'green').Console::text('waiting for api response', 'white').Console::text(' ... ', 'green'));
         }
     }
 
@@ -145,10 +145,10 @@ 
         self::printLogo();
 
         Console::log();
-        Console::log(Console::text('  Kristuff/AbuseIPDB Client version: ', 'darkgray') . Console::text(AbuseIPDBClient::VERSION, 'lightgray'));
-        Console::log(Console::text('  Kristuff/AbuseIPDB Core version:   ', 'darkgray') . Console::text(ApiHandler::VERSION, 'lightgray')); 
+        Console::log(Console::text('  Kristuff/AbuseIPDB Client version: ', 'darkgray').Console::text(AbuseIPDBClient::VERSION, 'lightgray'));
+        Console::log(Console::text('  Kristuff/AbuseIPDB Core version:   ', 'darkgray').Console::text(ApiHandler::VERSION, 'lightgray')); 
         Console::log(Console::text('  Released under the MIT licence', 'darkgray'));
-        Console::log(Console::text('  Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray'));
+        Console::log(Console::text('  Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray'));
         Console::log(
             Console::text('  © 2020-2022 Kristuff (', 'darkgray').
             Console::text('https://github.com/kristuff', 'darkgray', 'underlined').
@@ -170,8 +170,8 @@ 
     {
         if (self::isDefaultOuput()) {
             Console::log();    
-            Console::log( Console::text(' Kristuff/AbuseIPDB-client ', 'darkgray') . Console::text(' ' . AbuseIPDBClient::VERSION . ' ', 'white', 'blue')); 
-            Console::log(Console::text(' Made with ', 'darkgray') . Console::text('♥', 'red') . Console::text(' in France', 'darkgray')); 
+            Console::log(Console::text(' Kristuff/AbuseIPDB-client ', 'darkgray').Console::text(' '.AbuseIPDBClient::VERSION.' ', 'white', 'blue')); 
+            Console::log(Console::text(' Made with ', 'darkgray').Console::text('♥', 'red').Console::text(' in France', 'darkgray')); 
             Console::log(Console::text(' © 2020-2022 Kristuff (', 'darkgray').
                 Console::text('https://github.com/kristuff', 'darkgray', 'underlined').
                 Console::text(')', 'darkgray')
@@ -191,19 +191,19 @@ 
     protected static function printFooter($requestTime = ''): void
     {
         if (self::isDefaultOuput()) {
-            if (!empty($requestTime)){
+            if (!empty($requestTime)) {
                 $date_utc = new \DateTime("now", new \DateTimeZone("UTC"));
                 Console::log(
-                    Console::text('  Request time: ', 'darkgray') . Console::text($requestTime . 's', 'lightgray'). 
-                    Console::text(' | UTC time: ', 'darkgray') . Console::text($date_utc->format('Y-m-d H:i:s'), 'lightgray')
+                    Console::text('  Request time: ', 'darkgray').Console::text($requestTime.'s', 'lightgray'). 
+                    Console::text(' | UTC time: ', 'darkgray').Console::text($date_utc->format('Y-m-d H:i:s'), 'lightgray')
                 );
             }
             Console::log(Console::text('  ------------------------------------------------------------------------------------------------------', 'darkgray')); 
             Console::log(
-                Console::text('  Kristuff\AbuseIPDB ', 'darkgray') . 
-                Console::text(AbuseIPDBClient::VERSION, 'lightgray') . 
-                Console::text(' | Made with ', 'darkgray') . 
-                Console::text('♥', 'red') .
+                Console::text('  Kristuff\AbuseIPDB ', 'darkgray'). 
+                Console::text(AbuseIPDBClient::VERSION, 'lightgray'). 
+                Console::text(' | Made with ', 'darkgray'). 
+                Console::text('♥', 'red').
                 Console::text(' in France | © 2020-2022 Kristuff (https://github.com/kristuff)', 'darkgray')
             ); 
             Console::log(); 
@@ -221,9 +221,9 @@ 
     protected static function printResult($text, $value, string $foregroundColor = 'lightred', string $backgroundColor = '', bool $print = true): string
     {
         // do not print null/blank values
-        if (isset($value)){
-            $line = Console::text($text, 'white') . Console::text($value, $foregroundColor, $backgroundColor); 
-            if ($print && self::isDefaultOuput()){
+        if (isset($value)) {
+            $line = Console::text($text, 'white').Console::text($value, $foregroundColor, $backgroundColor); 
+            if ($print && self::isDefaultOuput()) {
                 Console::log($line);
             }
             return $line;
@@ -247,16 +247,16 @@ 
         $scoreforegroundColor = 'white';
         $scoreBackgroundColor = 'green';
 
-        if (intval($score) > 0 ){
+        if (intval($score) > 0) {
             $scoreforegroundColor = 'black';
             $scoreBackgroundColor = 'yellow';
         } 
-        if (intval($score) > 50 ){
+        if (intval($score) > 50) {
             $scoreforegroundColor = 'white';
             $scoreBackgroundColor = 'red';
         } 
   
-        $badge = str_pad(strval($score), 3, ' ',STR_PAD_LEFT); 
+        $badge = str_pad(strval($score), 3, ' ', STR_PAD_LEFT); 
         return Console::text($padding.$badge.$padding, $scoreforegroundColor, $scoreBackgroundColor);
     }
 }
\ No newline at end of file