kristuff / abuseipdb-cli

src/ErrorsTrait.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      */
     protected static function printPlainTextErrors(object $response)
     {
-        foreach ($response->errors as $err){
+        foreach ($response->errors as $err) {
             $text = 'Error: ';
             $text .= self::getErrorDetail($err, 'title');
             $text .= self::getErrorDetail($err, 'statuts');
@@ -59,11 +59,11 @@ 
      */
     private static function getErrorDetail(object $error, string $field, ?string $parent = null)
     {
-        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 : '';
     }
 
 }
\ No newline at end of file

src/ShellUtils.php

Spacing +37 added lines, -37 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);
     }
 
@@ -264,7 +264,7 @@ 
      * 
      * @return bool     
      */
-    protected static function hasErrors(object $response, bool $checkForEmpty = true )
+    protected static function hasErrors(object $response, bool $checkForEmpty = true)
     {
         return $checkForEmpty ? self::parseErrors($response) || self::checkForEmpty($response) : self::parseErrors($response);
     }
@@ -281,8 +281,8 @@ 
      */
     private static function parseErrors(object $response)
     {
-        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;
@@ -312,7 +312,7 @@ 
     protected static function checkForEmpty(object $response)
     {
         // check for empty response ?
-        if ( empty($response) || empty($response->data) ){
+        if (empty($response) || empty($response->data)) {
             self::error('An unexpected error occurred.');
             return true;
         }
@@ -330,24 +330,24 @@ 
     protected static function printFormattedErrors(object $response)
     {
         // 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('   ---');
             }
         }
@@ -367,11 +367,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();
@@ -391,7 +391,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);
@@ -415,10 +415,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);