kristuff / abuseipdb-cli

src/AbstractClient.php

Spacing +33 added lines, -33 removed lines

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