Passed
Pull Request — master (#19)
by Kris
02:09
created
src/CheckTrait.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     protected static function printCheckScore(object $response): void
41 41
     {
42 42
         $score = empty($response->data->abuseConfidenceScore) ? 0 : $response->data->abuseConfidenceScore;
43
-        $line = Console::text(Console::pad('   Confidence score:', 23), 'white') . self::getScoreBadge($score);
43
+        $line = Console::text(Console::pad('   Confidence score:', 23), 'white').self::getScoreBadge($score);
44 44
         Console::log($line);
45 45
     }
46 46
 
@@ -59,26 +59,26 @@  discard block
 block discarded – undo
59 59
         //  self::printResult('   isPublic', $response->data->isPublic, $defaultColor);
60 60
         //  self::printResult('   ipVersion', $response->data->ipVersion, $defaultColor);
61 61
  
62
-        $line = self::printResult(Console::pad('   Whitelisted:', 23), $response->data->isWhitelisted ? 'true': 'false', $color, '', false);
62
+        $line = self::printResult(Console::pad('   Whitelisted:', 23), $response->data->isWhitelisted ? 'true' : 'false', $color, '', false);
63 63
         $line .= $response->data->isWhitelisted ? Console::text(' ★', 'green') : ''; 
64 64
         Console::log($line);
65 65
        
66 66
         self::printResult(Console::pad('   Country code:', 23), $response->data->countryCode, $color);
67 67
         
68
-        if (!empty($response->data->countryName)){
68
+        if (!empty($response->data->countryName)) {
69 69
             self::printResult(Console::pad('   Country name:', 23), $response->data->countryName, $color);
70 70
         }
71 71
 
72 72
         self::printResult(Console::pad('   ISP:', 23), $response->data->isp, $color);
73 73
 
74
-        if ($response->data->usageType){
74
+        if ($response->data->usageType) {
75 75
             $line = self::printResult(Console::pad('   Usage type:', 23), $response->data->usageType, $color, '', false);
76 76
             $line .= $response->data->usageType === 'Reserved' ? Console::text(' ◆', 'green') : '';
77 77
             Console::log($line);
78 78
         }
79 79
 
80 80
         $hostames = implode(', ', array_filter($response->data->hostnames)) ?? null;
81
-        if (!empty($hostames)){
81
+        if (!empty($hostames)) {
82 82
             self::printResult(Console::pad('   Hostname(s):', 23), $hostames, $color);
83 83
         }
84 84
 
@@ -100,19 +100,19 @@  discard block
 block discarded – undo
100 100
     {
101 101
         $nbReport = $response->data->totalReports && is_numeric($response->data->totalReports) ? intval($response->data->totalReports) : 0;
102 102
         
103
-        if ($nbReport > 0 ){
103
+        if ($nbReport > 0) {
104 104
             $line  = self::printResult(Console::pad('   Total reports:', 23), $nbReport, $color, '', false);
105 105
             $line .= self::printResult(' from ', $response->data->numDistinctUsers, $color, '', false);
106
-            $line .= Console::text($nbReport > 0 ? ' distinct users': ' user', 'white');
106
+            $line .= Console::text($nbReport > 0 ? ' distinct users' : ' user', 'white');
107 107
             Console::log($line);
108 108
 
109 109
         } else {
110 110
             // no reports
111
-            $day = $maxAge > 1 ? 'in last '. $maxAge . ' days': ' today';
112
-            Console::log( Console::text('   ✓', 'green') . Console::text(' Not reported ' . $day));
111
+            $day = $maxAge > 1 ? 'in last '.$maxAge.' days' : ' today';
112
+            Console::log(Console::text('   ✓', 'green').Console::text(' Not reported '.$day));
113 113
         }
114 114
         
115
-        if (!empty($response->data->lastReportedAt)){
115
+        if (!empty($response->data->lastReportedAt)) {
116 116
             self::printResult(Console::pad('   Last reported at:', 23), self::getDate($response->data->lastReportedAt), $color);
117 117
         }
118 118
     }
@@ -132,12 +132,12 @@  discard block
 block discarded – undo
132 132
     {
133 133
         $nbLastReports = isset($response->data->reports) ? count($response->data->reports) : 0;
134 134
             
135
-        if ($nbLastReports > 0){
135
+        if ($nbLastReports > 0) {
136 136
             Console::log('   Last reports:', 'white');
137 137
             $numberDiplayedReports = 0;
138 138
             $defaultColor = 'lightyellow'; // reset color for last reports
139 139
         
140
-            foreach ($response->data->reports as $report){
140
+            foreach ($response->data->reports as $report) {
141 141
                 self::printLastReport($report);
142 142
                 $numberDiplayedReports++;
143 143
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
                     $line .= Console::text($numberDiplayedReports, $defaultColor);
147 147
                     $line .= Console::text('/', 'white');
148 148
                     $line .= Console::text($nbLastReports, $defaultColor);
149
-                    $line .= Console::text($numberDiplayedReports > 1 ? ' reports displayed)': ' report displayed)', 'white');
149
+                    $line .= Console::text($numberDiplayedReports > 1 ? ' reports displayed)' : ' report displayed)', 'white');
150 150
                     Console::log($line);
151 151
                     break;
152 152
                 }
@@ -171,15 +171,15 @@  discard block
 block discarded – undo
171 171
         $line  = Console::text('    →', $defaultColor);
172 172
         $line .= self::printResult(' reported at: ', self::getDate($report->reportedAt), $defaultColor, '', false);
173 173
   //    $line .= self::printResult(' by user: ', $report->reporterId, $defaultColor, '', false);
174
-        if (isset($report->reporterCountryCode) && isset($report->reporterCountryName)){
174
+        if (isset($report->reporterCountryCode) && isset($report->reporterCountryName)) {
175 175
             $line .= Console::text(' from: ', 'white');
176 176
             $line .= self::printResult('', $report->reporterCountryCode, $defaultColor, '', false);
177 177
             $line .= Console::text(' - ', 'white');
178 178
             $line .= self::printResult('', $report->reporterCountryName, $defaultColor, '', false);
179 179
         }
180
-        $line .= Console::text(' with categor' .  (count($categories) > 1 ? "ies: " : "y: "), 'white');
180
+        $line .= Console::text(' with categor'.(count($categories) > 1 ? "ies: " : "y: "), 'white');
181 181
         foreach ($categories as $key => $cat) {
182
-            $line .= Console::text($key==0 ? '' : ',' , 'white') . Console::text($cat, $defaultColor);
182
+            $line .= Console::text($key == 0 ? '' : ',', 'white').Console::text($cat, $defaultColor);
183 183
         }
184 184
         Console::log($line);
185 185
     }  
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
     private static function getLastReportsCategories(object $report): array
197 197
     {
198 198
         $categories = [];
199
-        foreach (array_filter($report->categories) as $catId){
199
+        foreach (array_filter($report->categories) as $catId) {
200 200
             $cat = ApiHandler::getCategoryNameById(strval($catId));
201 201
             if ($cat !== false) {
202 202
                 $categories[] = $cat;
Please login to merge, or discard this patch.
src/AbuseIPDBClient.php 1 patch
Spacing   +114 added lines, -115 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     {
49 49
         // required at least one valid argument
50 50
         self::$keyPath = $keyPath; 
51
-        self::validate( !empty($arguments), 'No valid arguments given. Run abuseipdb --help to get help.');
51
+        self::validate(!empty($arguments), 'No valid arguments given. Run abuseipdb --help to get help.');
52 52
         if (!self::parseCommand($arguments, $keyPath)) {
53 53
             self::error('Invalid arguments. Run abuseipdb --help to get help.');
54 54
             self::printFooter();
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
     {
70 70
         self::printTitle(Console::text('  ► Register API key ', 'darkgray'));
71 71
         
72
-        $key = self::getArgumentValue($arguments,'S', 'save-key');
72
+        $key = self::getArgumentValue($arguments, 'S', 'save-key');
73 73
         
74
-        if (empty($key)){
74
+        if (empty($key)) {
75 75
             self::error('Null or invalid key argument.');
76 76
             self::printFooter();
77 77
             Program::exit(1);
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
 
80 80
         $data = json_encode(['api_key' => $key]);
81 81
        
82
-        if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false){
82
+        if (file_put_contents(self::$keyPath, $data, LOCK_EX) === false) {
83 83
             self::error('An error occurred when writing config file. Make sure to give the appropriate permissions to the config directory.');
84 84
             self::printFooter();
85 85
             Program::exit(1);
86 86
         }
87
-        Console::log(Console::text('  ✓ ', 'green') . Console::text('Your config key file has been successfully created.', 'white'));
87
+        Console::log(Console::text('  ✓ ', 'green').Console::text('Your config key file has been successfully created.', 'white'));
88 88
         Console::log();   
89 89
         self::printFooter();
90 90
         Program::exit();
@@ -102,61 +102,61 @@  discard block
 block discarded – undo
102 102
     {
103 103
         self::printBanner();
104 104
 
105
-        Console::log(' ' . Console::text('SYNOPSIS:', 'white', 'underline')); 
106
-        Console::log(' ' . Console::text('    abuseipdb -C ') . 
107
-                           Console::text('IP', 'yellow') . 
108
-                           Console::text(' [-d ') . 
109
-                           Console::text('DAYS', 'yellow') . 
110
-                           Console::text('] [-v] [-l ') . 
111
-                           Console::text('LIMIT', 'yellow') . 
112
-                           Console::text('] [-o ') . 
113
-                           Console::text('FORMAT', 'yellow') . 
105
+        Console::log(' '.Console::text('SYNOPSIS:', 'white', 'underline')); 
106
+        Console::log(' '.Console::text('    abuseipdb -C '). 
107
+                           Console::text('IP', 'yellow'). 
108
+                           Console::text(' [-d '). 
109
+                           Console::text('DAYS', 'yellow'). 
110
+                           Console::text('] [-v] [-l '). 
111
+                           Console::text('LIMIT', 'yellow'). 
112
+                           Console::text('] [-o '). 
113
+                           Console::text('FORMAT', 'yellow'). 
114 114
                            Console::text(']')); 
115 115
 
116
-        Console::log(' ' . Console::text('    abuseipdb -K ') . 
117
-                           Console::text('NETWORK', 'yellow') . 
118
-                           Console::text(' [-d ') . 
119
-                           Console::text('DAYS', 'yellow') . 
120
-                           Console::text('] [-o ') . 
121
-                           Console::text('FORMAT', 'yellow') . 
116
+        Console::log(' '.Console::text('    abuseipdb -K '). 
117
+                           Console::text('NETWORK', 'yellow'). 
118
+                           Console::text(' [-d '). 
119
+                           Console::text('DAYS', 'yellow'). 
120
+                           Console::text('] [-o '). 
121
+                           Console::text('FORMAT', 'yellow'). 
122 122
                            Console::text(']')); 
123 123
 
124
-        Console::log(' ' . Console::text('    abuseipdb -R ') .
125
-                           Console::text('IP', 'yellow') . ' -c ' .
126
-                           Console::text('CATEGORIES', 'yellow') . ' -m ' .
127
-                           Console::text('MESSAGE', 'yellow') .
128
-                           Console::text(' [-o ') . 
129
-                           Console::text('FORMAT', 'yellow') . 
124
+        Console::log(' '.Console::text('    abuseipdb -R ').
125
+                           Console::text('IP', 'yellow').' -c '.
126
+                           Console::text('CATEGORIES', 'yellow').' -m '.
127
+                           Console::text('MESSAGE', 'yellow').
128
+                           Console::text(' [-o '). 
129
+                           Console::text('FORMAT', 'yellow'). 
130 130
                            Console::text(']')); 
131 131
 
132
-        Console::log(' ' . Console::text('    abuseipdb -V ') .
133
-                           Console::text('FILE', 'yellow') .
134
-                           Console::text(' [-o ') . 
135
-                           Console::text('FORMAT', 'yellow') . 
132
+        Console::log(' '.Console::text('    abuseipdb -V ').
133
+                           Console::text('FILE', 'yellow').
134
+                           Console::text(' [-o '). 
135
+                           Console::text('FORMAT', 'yellow'). 
136 136
                            Console::text(']')); 
137 137
 
138
-        Console::log(' ' . Console::text('    abuseipdb -E ') .
138
+        Console::log(' '.Console::text('    abuseipdb -E ').
139 139
                            Console::text('IP', 'yellow').
140
-                           Console::text(' [-o ') . 
141
-                           Console::text('FORMAT', 'yellow') . 
140
+                           Console::text(' [-o '). 
141
+                           Console::text('FORMAT', 'yellow'). 
142 142
                            Console::text(']')); 
143 143
                            
144
-        Console::log(' ' . Console::text('    abuseipdb -B ') . 
145
-                           Console::text('[-l ') . 
146
-                           Console::text('LIMIT', 'yellow') . 
147
-                           Console::text('] [-s ') . 
148
-                           Console::text('SCORE', 'yellow') . 
149
-                           Console::text('] [-o ') . 
150
-                           Console::text('FORMAT', 'yellow') . 
144
+        Console::log(' '.Console::text('    abuseipdb -B '). 
145
+                           Console::text('[-l '). 
146
+                           Console::text('LIMIT', 'yellow'). 
147
+                           Console::text('] [-s '). 
148
+                           Console::text('SCORE', 'yellow'). 
149
+                           Console::text('] [-o '). 
150
+                           Console::text('FORMAT', 'yellow'). 
151 151
                            Console::text(']')); 
152 152
 
153
-        Console::log(' ' . Console::text('    abuseipdb -S ' .
153
+        Console::log(' '.Console::text('    abuseipdb -S '.
154 154
                            Console::text('KEY', 'yellow')));
155 155
 
156
-        Console::log(' ' . Console::text('    abuseipdb -L | -G | -h | --version'));
156
+        Console::log(' '.Console::text('    abuseipdb -L | -G | -h | --version'));
157 157
                            
158 158
         Console::log();    
159
-        Console::log(' ' . Console::text('OPTIONS:', 'white', 'underline')); 
159
+        Console::log(' '.Console::text('OPTIONS:', 'white', 'underline')); 
160 160
         Console::log();
161 161
         Console::log(Console::text('   -h, --help', 'white')); 
162 162
         Console::log('       Prints the current help.', 'lightgray');
@@ -167,62 +167,62 @@  discard block
 block discarded – undo
167 167
         Console::log(Console::text('   -L, --list', 'white')); 
168 168
         Console::log('       Prints the list report categories.', 'lightgray');
169 169
         Console::log();    
170
-        Console::log(Console::text('   -C, --check ', 'white') . Console::text('IP', 'yellow', 'underline')); 
170
+        Console::log(Console::text('   -C, --check ', 'white').Console::text('IP', 'yellow', 'underline')); 
171 171
         Console::log('       Performs a check request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
172 172
         Console::log();    
173
-        Console::log(Console::text('   -K, --check-block ', 'white') . Console::text('NETWORK', 'yellow', 'underline')); 
173
+        Console::log(Console::text('   -K, --check-block ', 'white').Console::text('NETWORK', 'yellow', 'underline')); 
174 174
         Console::log('       Performs a check-block request for the given network. A valid subnet (v4 or v6) denoted with ', 'lightgray');
175 175
         Console::log('       CIDR notation is required.', 'lightgray');
176 176
         Console::log();    
177
-        Console::log(Console::text('   -d, --days ', 'white') . Console::text('DAYS', 'yellow', 'underline')); 
177
+        Console::log(Console::text('   -d, --days ', 'white').Console::text('DAYS', 'yellow', 'underline')); 
178 178
         Console::log('       For a check or check-block request, defines the maxAgeDays. Min is 1, max is 365, default is 30.', 'lightgray');
179 179
         Console::log();    
180
-        Console::log(Console::text('   -R, --report ', 'white') . Console::text('IP', 'yellow', 'underline')); 
180
+        Console::log(Console::text('   -R, --report ', 'white').Console::text('IP', 'yellow', 'underline')); 
181 181
         Console::log('       Performs a report request for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
182 182
         Console::log();    
183
-        Console::log(Console::text('   -V, --bulk-report ', 'white') . Console::text('FILE', 'yellow', 'underline')); 
183
+        Console::log(Console::text('   -V, --bulk-report ', 'white').Console::text('FILE', 'yellow', 'underline')); 
184 184
         Console::log('       Performs a bulk-report request sending a csv file. A valid file name or full path is required.', 'lightgray');
185 185
         Console::log();    
186 186
         Console::log(Console::text('   -E, --clear ', 'white')); 
187 187
         Console::log('       Remove own reports for the given IP address. A valid IPv4 or IPv6 address is required.', 'lightgray');
188 188
         Console::log();
189
-        Console::log(Console::text('   -c, --categories ', 'white') . Console::text('CATEGORIES', 'yellow', 'underline')); 
189
+        Console::log(Console::text('   -c, --categories ', 'white').Console::text('CATEGORIES', 'yellow', 'underline')); 
190 190
         Console::log('       For a report request, defines the report category(ies). Categories must be separate by a comma.', 'lightgray');
191 191
         Console::log('       Some categories cannot be used alone. A category can be represented by its shortname or by its', 'lightgray');
192
-        Console::log(Console::text('       id. Use ','lightgray')  . Console::text('abuseipdb -L', 'white') . Console::text(' to print the categories list.','lightgray'));
192
+        Console::log(Console::text('       id. Use ', 'lightgray').Console::text('abuseipdb -L', 'white').Console::text(' to print the categories list.', 'lightgray'));
193 193
         Console::log();    
194
-        Console::log(Console::text('   -m, --message ', 'white') . Console::text('MESSAGE', 'yellow', 'underline')); 
194
+        Console::log(Console::text('   -m, --message ', 'white').Console::text('MESSAGE', 'yellow', 'underline')); 
195 195
         Console::log('       For a report request, defines the message to send with report. Message is required for all', 'lightgray');
196 196
         Console::log('       report requests.', 'lightgray');
197 197
         Console::log();
198 198
         Console::log(Console::text('   -B, --blacklist ', 'white')); 
199 199
         Console::log('       Performs a blacklist request. Default limit is 1000. This limit can ne changed with the', 'lightgray');
200
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
200
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
201 201
         Console::log();    
202
-        Console::log(Console::text('   -l, --limit ', 'white') . Console::text('LIMIT', 'yellow', 'underline')); 
202
+        Console::log(Console::text('   -l, --limit ', 'white').Console::text('LIMIT', 'yellow', 'underline')); 
203 203
         Console::log('       For a blacklist request, defines the limit.', 'lightgray');
204 204
         Console::log('       For a check request with verbose flag, sets the max number of last reports displayed. Default is 10', 'lightgray');
205 205
         Console::log('       For a check-block request, sets the max number of IPs displayed. Default is 0 (no limit).', 'lightgray');
206 206
         Console::log();    
207
-        Console::log(Console::text('   -o, --output ', 'white') . Console::text('FORMAT', 'yellow', 'underline')); 
207
+        Console::log(Console::text('   -o, --output ', 'white').Console::text('FORMAT', 'yellow', 'underline')); 
208 208
         Console::log('       Defines the output format for API requests. Default is a colorized report, possible formats are', 'lightgray');
209
-        Console::log('       '. Console::text('json', 'yellow', 'underline') . ' or ' . Console::text('plaintext', 'yellow', 'underline') . '. Plaintext option prints partial response (blacklist: IPs list, ');
209
+        Console::log('       '.Console::text('json', 'yellow', 'underline').' or '.Console::text('plaintext', 'yellow', 'underline').'. Plaintext option prints partial response (blacklist: IPs list, ');
210 210
         Console::log('       check or report: confidence score only, check-block: reported IPs list with confidence score, ', 'lightgray');
211 211
         Console::log('       bulk-report: number of saved reports, clear: number of deleted reports).', 'lightgray');
212 212
         Console::log();    
213
-        Console::log(Console::text('   -s, --score ', 'white'). Console::text('SCORE', 'yellow', 'underline')); 
213
+        Console::log(Console::text('   -s, --score ', 'white').Console::text('SCORE', 'yellow', 'underline')); 
214 214
         Console::log('       For a blacklist request, sets the confidence score minimum. The confidence minimum ', 'lightgray');
215 215
         Console::log('       must be between 25 and 100. This parameter is subscriber feature (not honored otherwise, allways 100).', 'lightgray');
216 216
         Console::log();    
217 217
         Console::log(Console::text('   -v, --verbose ', 'white')); 
218 218
         Console::log('       For a check request, display additional fields like the x last reports. This increases ', 'lightgray');
219 219
         Console::log(Console::text('       request time and response size. Max number of last reports displayed can be changed with the ', 'lightgray'));
220
-        Console::log('       ' . Console::text('--limit', 'white') . Console::text(' parameter. ', 'lightgray'));
220
+        Console::log('       '.Console::text('--limit', 'white').Console::text(' parameter. ', 'lightgray'));
221 221
         Console::log();    
222 222
         Console::log(Console::text('   --version', 'white')); 
223 223
         Console::log('       Prints the current version.', 'lightgray');
224 224
         Console::log(); 
225
-        Console::log(Console::text('   -S, --save-key ', 'white') . Console::text('KEY', 'yellow', 'underline')); 
225
+        Console::log(Console::text('   -S, --save-key ', 'white').Console::text('KEY', 'yellow', 'underline')); 
226 226
         Console::log('       Save the given API key in the configuration file. Requires writing permissions on the config directory. ', 'lightgray');
227 227
         Console::log(); 
228 228
     }
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
 
242 242
         self::printTitle(Console::text('  ► Current configuration ', 'darkgray'));
243 243
         
244
-        Console::log(Console::text('  api_key:[', 'white') . Console::text($conf['apiKey'], 'green') . Console::text(']', 'white'));
244
+        Console::log(Console::text('  api_key:[', 'white').Console::text($conf['apiKey'], 'green').Console::text(']', 'white'));
245 245
         Console::log(Console::text('  self_ips:', 'white'));
246 246
         
247 247
         foreach ($conf['selfIps'] as $ip) {
248
-            Console::log(Console::text('    [', 'white') . Console::text($ip, 'green') . Console::text(']', 'white'));   
248
+            Console::log(Console::text('    [', 'white').Console::text($ip, 'green').Console::text(']', 'white'));   
249 249
         }
250 250
 
251 251
         Console::log();   
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
 
267 267
         $categories = ApiHandler::getCategories();
268 268
         $rowHeaders = [
269
-            Console::text('ShortName',      'darkgray') => 15, 
270
-            Console::text('Id',             'darkgray') => 2, 
271
-            Console::text('Full name',      'darkgray') => 18,
272
-            Console::text('Can be alone?',  'darkgray') => 15
269
+            Console::text('ShortName', 'darkgray') => 15, 
270
+            Console::text('Id', 'darkgray') => 2, 
271
+            Console::text('Full name', 'darkgray') => 18,
272
+            Console::text('Can be alone?', 'darkgray') => 15
273 273
         ];
274 274
         Console::$verticalSeparator = '  ';
275 275
         Console::$verticalInnerSeparator = '  ';
@@ -279,17 +279,16 @@  discard block
 block discarded – undo
279 279
         
280 280
         foreach ($categories as $cat) {
281 281
             $id = Console::text($cat[1], 'white');
282
-            $standalone = $cat[3] ? Console::text('✓', 'green') . Console::text(' true ', 'lightgray') : 
283
-                                    Console::text('✗', 'red')   . Console::text(' false', 'darkgray');
284
-            $shortName =  Console::text($cat[0], 'white');
285
-            $fullName =   Console::text($cat[2], 'lightgray');
282
+            $standalone = $cat[3] ? Console::text('✓', 'green').Console::text(' true ', 'lightgray') : Console::text('✗', 'red').Console::text(' false', 'darkgray');
283
+            $shortName = Console::text($cat[0], 'white');
284
+            $fullName = Console::text($cat[2], 'lightgray');
286 285
 
287 286
             Console::log(
288 287
                 Console::TableRowStart().  
289
-                Console::TableRowCell( $shortName , 15).  
290
-                Console::TableRowCell( $id , 2, Console::ALIGN_CENTER).  
291
-                Console::TableRowCell( $fullName , 18).  
292
-                Console::TableRowCell( $standalone , 15,  Console::ALIGN_CENTER)  
288
+                Console::TableRowCell($shortName, 15).  
289
+                Console::TableRowCell($id, 2, Console::ALIGN_CENTER).  
290
+                Console::TableRowCell($fullName, 18).  
291
+                Console::TableRowCell($standalone, 15, Console::ALIGN_CENTER)  
293 292
             );
294 293
         }
295 294
         //Console::log(Console::tableRowSeparator($rowHeaders), 'darkgray');
@@ -308,11 +307,11 @@  discard block
 block discarded – undo
308 307
      */
309 308
     protected static function reportIP(array $arguments): void
310 309
     {
311
-        $ip      = self::getArgumentValue($arguments,'R', 'report');
312
-        $cats    = self::getArgumentValue($arguments,'c', 'categories');
313
-        $message = self::getArgumentValue($arguments,'m', 'message');
310
+        $ip      = self::getArgumentValue($arguments, 'R', 'report');
311
+        $cats    = self::getArgumentValue($arguments, 'c', 'categories');
312
+        $message = self::getArgumentValue($arguments, 'm', 'message');
314 313
         
315
-        self::printTitle(Console::text('  ► Report IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
314
+        self::printTitle(Console::text('  ► Report IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
316 315
         self::printTempMessage();
317 316
 
318 317
         // Peforms request 
@@ -323,7 +322,7 @@  discard block
 block discarded – undo
323 322
         self::clearTempMessage();
324 323
         
325 324
         // check for errors / empty response
326
-        if (self::hasErrors($report)){
325
+        if (self::hasErrors($report)) {
327 326
             self::printFooter();
328 327
             Program::exit(1);
329 328
         }
@@ -332,14 +331,14 @@  discard block
 block discarded – undo
332 331
         $score = empty($report->data->abuseConfidenceScore) ? 0 : $report->data->abuseConfidenceScore;
333 332
         $scoreColor = self::getScoreColor($score);
334 333
 
335
-        switch (self::$outputFormat){
334
+        switch (self::$outputFormat) {
336 335
             case self::OUTPUT_JSON:
337 336
                 echo json_encode($report, JSON_PRETTY_PRINT);
338 337
                 break;
339 338
        
340 339
             case self::OUTPUT_DEFAULT:  
341 340
                 Console::log(
342
-                    Console::text('   ✓', 'green').Console::text(' IP: [', 'white') .
341
+                    Console::text('   ✓', 'green').Console::text(' IP: [', 'white').
343 342
                     Console::text($ip, $scoreColor).Console::text('] successfully reported', 'white')
344 343
                 );
345 344
                 Console::log(Console::text('     Confidence score: ', 'white').self::getScoreBadge($score));
@@ -365,26 +364,26 @@  discard block
 block discarded – undo
365 364
      */
366 365
     protected static function bulkReport(array $arguments): void
367 366
     {
368
-        $fileName = self::getArgumentValue($arguments,'V', 'bulk-report');
367
+        $fileName = self::getArgumentValue($arguments, 'V', 'bulk-report');
369 368
 
370
-        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray') . Console::text(escapeshellcmd($fileName), 'white'));
369
+        self::printTitle(Console::text('  ► Bulk report for file: ', 'darkgray').Console::text(escapeshellcmd($fileName), 'white'));
371 370
         self::printTempMessage();
372 371
 
373 372
         // Peforms request 
374 373
         $timeStart = microtime(true);  
375 374
         $response = self::$api->bulkReport($fileName)->getObject();     
376 375
         $timeEnd = microtime(true);      
377
-        $time = $timeEnd - $timeStart;  // request time
376
+        $time = $timeEnd - $timeStart; // request time
378 377
         self::clearTempMessage();
379 378
 
380 379
         // check for errors / empty response
381
-        if (self::hasErrors($response)){
380
+        if (self::hasErrors($response)) {
382 381
             self::printFooter();
383 382
             Program::exit(1);
384 383
         }
385 384
 
386 385
         // ✓ Done
387
-        switch (self::$outputFormat){
386
+        switch (self::$outputFormat) {
388 387
             case self::OUTPUT_JSON:
389 388
                 echo json_encode($response, JSON_PRETTY_PRINT);
390 389
                 break;
@@ -399,7 +398,7 @@  discard block
 block discarded – undo
399 398
 
400 399
             case self::OUTPUT_PLAINTEXT:
401 400
                 $nbSavedReports = isset($response->data->savedReports) ? $response->data->savedReports : 0;
402
-                echo $nbSavedReports . PHP_EOL;
401
+                echo $nbSavedReports.PHP_EOL;
403 402
                 break;
404 403
 
405 404
         }
@@ -416,8 +415,8 @@  discard block
 block discarded – undo
416 415
      */
417 416
     protected static function clearIP(array $arguments): void
418 417
     {
419
-        $ip = self::getArgumentValue($arguments,'E', 'clear');
420
-        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white'));
418
+        $ip = self::getArgumentValue($arguments, 'E', 'clear');
419
+        self::printTitle(Console::text('  ► Clear reports for IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white'));
421 420
 
422 421
         // Peforms request 
423 422
         self::printTempMessage();
@@ -428,22 +427,22 @@  discard block
 block discarded – undo
428 427
         self::clearTempMessage();
429 428
 
430 429
         // check for errors / empty response
431
-        if (self::hasErrors($response)){
430
+        if (self::hasErrors($response)) {
432 431
             self::printFooter($time);
433 432
             Program::exit(1);
434 433
         }
435 434
         
436 435
         // ✓ Done: print deleted report number 
437
-        switch (self::$outputFormat){
436
+        switch (self::$outputFormat) {
438 437
             case self::OUTPUT_JSON:
439 438
                 echo json_encode($response, JSON_PRETTY_PRINT);
440 439
                 break;
441 440
        
442 441
             case self::OUTPUT_DEFAULT:  
443 442
                 Console::log(
444
-                    Console::text('   ✓', 'green') . 
445
-                    Console::text(' Successfull clear request for IP: [', 'white') .
446
-                    Console::text($ip, 'lightyellow') .
443
+                    Console::text('   ✓', 'green'). 
444
+                    Console::text(' Successfull clear request for IP: [', 'white').
445
+                    Console::text($ip, 'lightyellow').
447 446
                     Console::text(']', 'white')
448 447
                 );
449 448
                 self::printResult('     Deleted reports: ', $response->data->numReportsDeleted ?? 0, 'lightyellow');
@@ -452,7 +451,7 @@  discard block
 block discarded – undo
452 451
                 break;
453 452
 
454 453
             case self::OUTPUT_PLAINTEXT:
455
-                echo ($response->data->numReportsDeleted ?? 0) . PHP_EOL;
454
+                echo ($response->data->numReportsDeleted ?? 0).PHP_EOL;
456 455
                 break;
457 456
 
458 457
         }
@@ -472,8 +471,8 @@  discard block
 block discarded – undo
472 471
         self::printTitle(Console::text('  ► Get Blacklist ', 'darkgray'));
473 472
 
474 473
         $plainText  = (self::$outputFormat === self::OUTPUT_PLAINTEXT); 
475
-        $limit      = self::getNumericParameter($arguments,'l', 'limit', 1000);
476
-        $scoreMin   = self::getNumericParameter($arguments,'s', 'score', 100);
474
+        $limit      = self::getNumericParameter($arguments, 'l', 'limit', 1000);
475
+        $scoreMin   = self::getNumericParameter($arguments, 's', 'score', 100);
477 476
         
478 477
         self::printTempMessage();
479 478
         
@@ -487,13 +486,13 @@  discard block
 block discarded – undo
487 486
     
488 487
         // response could be json on error, while plaintext flag is set
489 488
         $decodedResponse = $response->getObject();
490
-        if (self::hasErrors($decodedResponse, false)){
489
+        if (self::hasErrors($decodedResponse, false)) {
491 490
             self::printFooter($time);
492 491
             Program::exit(1);
493 492
         }
494 493
 
495 494
         // ✓ Done: print deleted report number 
496
-        switch (self::$outputFormat){
495
+        switch (self::$outputFormat) {
497 496
             case self::OUTPUT_JSON:
498 497
                 echo json_encode($decodedResponse, JSON_PRETTY_PRINT);
499 498
                 break;
@@ -502,7 +501,7 @@  discard block
 block discarded – undo
502 501
                  // print list
503 502
                 self::printResult('  List generated at: ', self::getDate($decodedResponse->meta->generatedAt), 'lightyellow', '');
504 503
                 Console::log();
505
-                foreach ($decodedResponse->data as $report){
504
+                foreach ($decodedResponse->data as $report) {
506 505
                     $score = empty($report->abuseConfidenceScore) ? 0 : $report->abuseConfidenceScore;
507 506
                     $defaultColor = self::getScoreColor($score);
508 507
 
@@ -537,12 +536,12 @@  discard block
 block discarded – undo
537 536
      */
538 537
     protected static function checkBlock(array $arguments): void
539 538
     {
540
-        $network  = self::getArgumentValue($arguments,'K', 'check-block');
539
+        $network = self::getArgumentValue($arguments, 'K', 'check-block');
541 540
 
542
-        self::printTitle(Console::text('  ► Check network: ', 'darkgray') . Console::text(escapeshellcmd($network), 'white') . Console::text('', 'darkgray'));
541
+        self::printTitle(Console::text('  ► Check network: ', 'darkgray').Console::text(escapeshellcmd($network), 'white').Console::text('', 'darkgray'));
543 542
 
544 543
         $maxAge   = self::getNumericParameter($arguments, 'd', 'days', 30);
545
-        $limit    = self::getNumericParameter($arguments,'l', 'limit', 0); // 0 mean no limit
544
+        $limit    = self::getNumericParameter($arguments, 'l', 'limit', 0); // 0 mean no limit
546 545
 
547 546
         self::printTempMessage();
548 547
 
@@ -553,19 +552,19 @@  discard block
 block discarded – undo
553 552
         self::clearTempMessage();
554 553
 
555 554
         // check for errors / empty response
556
-        if (self::hasErrors($check)){
555
+        if (self::hasErrors($check)) {
557 556
             self::printFooter($time);
558 557
             Program::exit(1);
559 558
         }
560 559
 
561
-        switch (self::$outputFormat){
560
+        switch (self::$outputFormat) {
562 561
             case self::OUTPUT_JSON:
563 562
                 echo json_encode($check, JSON_PRETTY_PRINT);
564 563
                 break;
565 564
        
566 565
             case self::OUTPUT_DEFAULT:  
567 566
                 self::printCheckBlockDetail($check);
568
-                self::printCheckBlockReportedIP($check,$maxAge,$limit);
567
+                self::printCheckBlockReportedIP($check, $maxAge, $limit);
569 568
                 Console::log();
570 569
                 self::printFooter($time);
571 570
                 break;
@@ -574,8 +573,8 @@  discard block
 block discarded – undo
574 573
                 $nbReports = isset($check->data->reportedAddress) ? count($check->data->reportedAddress) : 0;
575 574
                 if ($nbReports > 0) {
576 575
                     $numberDiplayedReports = 0;
577
-                    foreach ($check->data->reportedAddress as $report){
578
-                        echo ($report->ipAddress) . ' ' . $report->abuseConfidenceScore . PHP_EOL;
576
+                    foreach ($check->data->reportedAddress as $report) {
577
+                        echo ($report->ipAddress).' '.$report->abuseConfidenceScore.PHP_EOL;
579 578
 
580 579
                         // counter
581 580
                         $numberDiplayedReports++;
@@ -599,14 +598,14 @@  discard block
 block discarded – undo
599 598
      */
600 599
     protected static function checkIP(array $arguments): void
601 600
     {
602
-        $ip = self::getArgumentValue($arguments,'C', 'check');
601
+        $ip = self::getArgumentValue($arguments, 'C', 'check');
603 602
         
604
-        self::printTitle(Console::text('  ► Check IP: ', 'darkgray') . Console::text(escapeshellcmd($ip), 'white') . Console::text('', 'darkgray'));
603
+        self::printTitle(Console::text('  ► Check IP: ', 'darkgray').Console::text(escapeshellcmd($ip), 'white').Console::text('', 'darkgray'));
605 604
         
606
-        $verbose            = self::inArguments($arguments,'v', 'verbose');
605
+        $verbose            = self::inArguments($arguments, 'v', 'verbose');
607 606
         $maxAge             = self::getNumericParameter($arguments, 'd', 'days', 30);
608
-        $maxReportsNumber   = self::getNumericParameter($arguments,'l', 'limit', 10);
609
-        $ip                 = self::getArgumentValue($arguments,'C', 'check');
607
+        $maxReportsNumber   = self::getNumericParameter($arguments, 'l', 'limit', 10);
608
+        $ip                 = self::getArgumentValue($arguments, 'C', 'check');
610 609
 
611 610
         self::printTempMessage();
612 611
         $timeStart = microtime(true);                                           
@@ -616,7 +615,7 @@  discard block
 block discarded – undo
616 615
         self::clearTempMessage();
617 616
 
618 617
         // check for errors / empty response
619
-        if (self::hasErrors($check)){
618
+        if (self::hasErrors($check)) {
620 619
             self::printFooter($time);
621 620
             Program::exit(1);
622 621
         }
@@ -624,7 +623,7 @@  discard block
 block discarded – undo
624 623
         // score and data color (depending of abuseConfidenceScore)
625 624
         $score = empty($check->data->abuseConfidenceScore) ? 0 : $check->data->abuseConfidenceScore;
626 625
 
627
-        switch (self::$outputFormat){
626
+        switch (self::$outputFormat) {
628 627
             case self::OUTPUT_JSON:
629 628
                 echo json_encode($check, JSON_PRETTY_PRINT);
630 629
                 break;
@@ -634,7 +633,7 @@  discard block
 block discarded – undo
634 633
                 self::printCheckScore($check);
635 634
                 self::printCheckDetail($check, $defaultColor);
636 635
                 self::printCheckReports($check, $maxAge, $defaultColor);
637
-                if ($verbose){
636
+                if ($verbose) {
638 637
                     self::printCheckLastReports($check, $maxReportsNumber);
639 638
                 }
640 639
                 Console::log();
@@ -642,7 +641,7 @@  discard block
 block discarded – undo
642 641
                 break;
643 642
 
644 643
             case self::OUTPUT_PLAINTEXT:
645
-                echo ($check->data->abuseConfidenceScore ?? 0) . PHP_EOL;
644
+                echo ($check->data->abuseConfidenceScore ?? 0).PHP_EOL;
646 645
                 break;
647 646
 
648 647
         }
Please login to merge, or discard this patch.