@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * @access protected |
| 51 | 51 | * @var array $selfIps |
| 52 | 52 | */ |
| 53 | - protected $selfIps = []; |
|
| 53 | + protected $selfIps = [ ]; |
|
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * Constructor |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @param array $myIps The Ips/domain name you dont want to display in report messages |
| 62 | 62 | * |
| 63 | 63 | */ |
| 64 | - public function __construct(string $apiKey, string $userId, array $myIps = []) |
|
| 64 | + public function __construct(string $apiKey, string $userId, array $myIps = [ ]) |
|
| 65 | 65 | { |
| 66 | 66 | $this->aipdbApiKey = $apiKey; |
| 67 | 67 | $this->aipdbUserId = $userId; |
@@ -100,22 +100,22 @@ discard block |
||
| 100 | 100 | { |
| 101 | 101 | |
| 102 | 102 | // check file exists |
| 103 | - if (!file_exists($configPath) || !is_file($configPath)){ |
|
| 103 | + if (!file_exists($configPath) || !is_file($configPath)) { |
|
| 104 | 104 | throw new \InvalidArgumentException('The file [' . $configPath . '] does not exist.'); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // check file is readable |
| 108 | - if (!is_readable($configPath)){ |
|
| 108 | + if (!is_readable($configPath)) { |
|
| 109 | 109 | throw new InvalidPermissionException('The file [' . $configPath . '] is not readable.'); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | // todo check file exist |
| 113 | 113 | $keyConfig = self::loadJsonFile($configPath); |
| 114 | - $selfIps = []; |
|
| 114 | + $selfIps = [ ]; |
|
| 115 | 115 | |
| 116 | 116 | // Look for other optional config files in the same directory |
| 117 | 117 | $selfIpsConfigPath = pathinfo($configPath, PATHINFO_DIRNAME) . DIRECTORY_SEPARATOR . 'self_ips.json'; |
| 118 | - if (file_exists($selfIpsConfigPath)){ |
|
| 118 | + if (file_exists($selfIpsConfigPath)) { |
|
| 119 | 119 | $selfIps = self::loadJsonFile($selfIpsConfigPath)->self_ips; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -158,17 +158,17 @@ discard block |
||
| 158 | 158 | public function report(string $ip = '', string $categories = '', string $message = '', bool $returnArray = false) |
| 159 | 159 | { |
| 160 | 160 | // ip must be set |
| 161 | - if (empty($ip)){ |
|
| 161 | + if (empty($ip)) { |
|
| 162 | 162 | throw new \InvalidArgumentException('Ip was empty'); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | // categories must be set |
| 166 | - if (empty($categories)){ |
|
| 166 | + if (empty($categories)) { |
|
| 167 | 167 | throw new \InvalidArgumentException('categories list was empty'); |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | // message must be set |
| 171 | - if (empty($message)){ |
|
| 171 | + if (empty($message)) { |
|
| 172 | 172 | throw new \InvalidArgumentException('report message was empty'); |
| 173 | 173 | } |
| 174 | 174 | |
@@ -210,21 +210,21 @@ discard block |
||
| 210 | 210 | foreach ($cats as $cat) { |
| 211 | 211 | |
| 212 | 212 | // get index on our array of categories |
| 213 | - $catIndex = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0); |
|
| 213 | + $catIndex = is_numeric($cat) ? $this->getCategoryIndex($cat, 1) : $this->getCategoryIndex($cat, 0); |
|
| 214 | 214 | |
| 215 | 215 | // check if found |
| 216 | - if ($catIndex === false ){ |
|
| 217 | - throw new \InvalidArgumentException('Invalid report category was given : ['. $cat . ']'); |
|
| 216 | + if ($catIndex === false) { |
|
| 217 | + throw new \InvalidArgumentException('Invalid report category was given : [' . $cat . ']'); |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | // get Id |
| 221 | - $catId = $this->aipdbApiCategories[$catIndex][1]; |
|
| 221 | + $catId = $this->aipdbApiCategories[ $catIndex ][ 1 ]; |
|
| 222 | 222 | |
| 223 | 223 | // need another ? |
| 224 | - if ($needAnother !== false){ |
|
| 224 | + if ($needAnother !== false) { |
|
| 225 | 225 | |
| 226 | 226 | // is a standalone cat ? |
| 227 | - if ($this->aipdbApiCategories[$catIndex][3] === false) { |
|
| 227 | + if ($this->aipdbApiCategories[ $catIndex ][ 3 ] === false) { |
|
| 228 | 228 | $needAnother = true; |
| 229 | 229 | |
| 230 | 230 | } else { |
@@ -235,10 +235,10 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | // set or add to cats list |
| 238 | - $catsString = ($catsString === '') ? $catId : $catsString .','.$catId; |
|
| 238 | + $catsString = ($catsString === '') ? $catId : $catsString . ',' . $catId; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - if ($needAnother !== false){ |
|
| 241 | + if ($needAnother !== false) { |
|
| 242 | 242 | throw new \InvalidArgumentException('Invalid report category paremeter given: some categories can\'t be used alone'); |
| 243 | 243 | } |
| 244 | 244 | |
@@ -262,18 +262,18 @@ discard block |
||
| 262 | 262 | public function check(string $ip = null, string $maxAge = '30', bool $verbose = false, bool $returnArray = false) |
| 263 | 263 | { |
| 264 | 264 | |
| 265 | - if (!is_numeric($maxAge)){ |
|
| 265 | + if (!is_numeric($maxAge)) { |
|
| 266 | 266 | throw new \InvalidArgumentException('maxAge must be a numeric value (' . $maxAge . ' was given)'); |
| 267 | 267 | } |
| 268 | 268 | $maxAge = intval($maxAge); |
| 269 | 269 | |
| 270 | 270 | // max age must less or equal to 365 |
| 271 | - if ($maxAge > 365 || $maxAge < 1){ |
|
| 271 | + if ($maxAge > 365 || $maxAge < 1) { |
|
| 272 | 272 | throw new \InvalidArgumentException('maxAge must be at least 1 and less than 365 (' . $maxAge . ' was given)'); |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | //ip must be set |
| 276 | - if (empty($ip)){ |
|
| 276 | + if (empty($ip)) { |
|
| 277 | 277 | throw new \InvalidArgumentException('ip argument must be set (null given)'); |
| 278 | 278 | } |
| 279 | 279 | |
@@ -284,12 +284,12 @@ discard block |
||
| 284 | 284 | ]; |
| 285 | 285 | |
| 286 | 286 | // option |
| 287 | - if ($verbose){ |
|
| 288 | - $data['verbose'] = true; |
|
| 287 | + if ($verbose) { |
|
| 288 | + $data[ 'verbose' ] = true; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | // check AbuseIPDB request |
| 292 | - return $this->apiRequest('check', $data, 'GET', $returnArray) ; |
|
| 292 | + return $this->apiRequest('check', $data, 'GET', $returnArray); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | /** |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $message = str_replace('\\', '', $message); |
| 357 | 357 | |
| 358 | 358 | // Remove self ips |
| 359 | - foreach ($this->selfIps as $ip){ |
|
| 359 | + foreach ($this->selfIps as $ip) { |
|
| 360 | 360 | $message = str_replace($ip, '[MUNGED]', $message); |
| 361 | 361 | } |
| 362 | 362 | |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | protected static function loadJsonFile(string $filePath, bool $throwError = true) |
| 384 | 384 | { |
| 385 | 385 | // check file exists |
| 386 | - if (!file_exists($filePath) || !is_file($filePath)){ |
|
| 386 | + if (!file_exists($filePath) || !is_file($filePath)) { |
|
| 387 | 387 | if ($throwError) { |
| 388 | 388 | throw new \Exception('Config file not found'); |
| 389 | 389 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | $json = json_decode(utf8_encode($content)); |
| 396 | 396 | |
| 397 | 397 | // check for errors |
| 398 | - if ($json == null && json_last_error() != JSON_ERROR_NONE){ |
|
| 398 | + if ($json == null && json_last_error() != JSON_ERROR_NONE) { |
|
| 399 | 399 | if ($throwError) { |
| 400 | 400 | throw new \LogicException(sprintf("Failed to parse config file Error: '%s'", json_last_error_msg())); |
| 401 | 401 | } |