@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ps2alerts\Api\Command\BaseCommand; |
6 | 6 | use Ps2alerts\Api\Repository\AlertRepository; |
7 | -use Symfony\Component\Console\Input\InputArgument; |
|
8 | 7 | use Symfony\Component\Console\Input\InputInterface; |
9 | 8 | use Symfony\Component\Console\Output\OutputInterface; |
10 | 9 |
@@ -9,15 +9,15 @@ |
||
9 | 9 | use Ps2alerts\Api\Command\TestCommand; |
10 | 10 | use Symfony\Component\Console\Application; |
11 | 11 | |
12 | -require __DIR__ . '/../vendor/autoload.php'; |
|
12 | +require __DIR__.'/../vendor/autoload.php'; |
|
13 | 13 | |
14 | 14 | // ENV loading |
15 | 15 | josegonzalez\Dotenv\Loader::load([ |
16 | - 'filepath' => __DIR__ . '/../.env', |
|
16 | + 'filepath' => __DIR__.'/../.env', |
|
17 | 17 | 'toEnv' => true |
18 | 18 | ]); |
19 | 19 | |
20 | -include __DIR__ . '/Command/CommandsCommon.php'; |
|
20 | +include __DIR__.'/Command/CommandsCommon.php'; |
|
21 | 21 | |
22 | 22 | $application = new Application(); |
23 | 23 | // List commands here |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | protected function configure() |
13 | 13 | { |
14 | - $container = include __DIR__ . '/../container.php'; |
|
14 | + $container = include __DIR__.'/../container.php'; |
|
15 | 15 | |
16 | 16 | $this->container = $container; |
17 | 17 | $this->auraFactory = $container->get('Ps2alerts\Api\Factory\AuraFactory'); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | /** |
116 | 116 | * Processes players for alert |
117 | 117 | * @param string $id Alert ID |
118 | - * @return void |
|
118 | + * @return integer |
|
119 | 119 | */ |
120 | 120 | protected function processPlayers($id) |
121 | 121 | { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | /** |
150 | 150 | * Processes outfits for alert |
151 | 151 | * @param string $id Alert ID |
152 | - * @return void |
|
152 | + * @return integer |
|
153 | 153 | */ |
154 | 154 | protected function processOutfits($id) |
155 | 155 | { |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | /** |
182 | 182 | * Processes XPs for alert |
183 | 183 | * @param string $id Alert ID |
184 | - * @return void |
|
184 | + * @return integer |
|
185 | 185 | */ |
186 | 186 | protected function processXP($id) |
187 | 187 | { |
@@ -208,11 +208,11 @@ discard block |
||
208 | 208 | /** |
209 | 209 | * Executes the process based on inputs |
210 | 210 | * @param string $id Alert ID |
211 | - * @param array $cols Columns to look for |
|
211 | + * @param string[] $cols Columns to look for |
|
212 | 212 | * @param string $table Table to look for |
213 | 213 | * @param string $totalsTable Table total to update if applicable |
214 | 214 | * @param string $filter Column to filter on |
215 | - * @param array $fields Fields to summarize |
|
215 | + * @param string[] $fields Fields to summarize |
|
216 | 216 | * @param array $groupBy Fields to group by |
217 | 217 | * @return int |
218 | 218 | */ |
@@ -270,6 +270,9 @@ discard block |
||
270 | 270 | return $count; |
271 | 271 | } |
272 | 272 | |
273 | + /** |
|
274 | + * @param string $id |
|
275 | + */ |
|
273 | 276 | protected function deleteAllFromTables(array $tables, $id, OutputInterface $output) |
274 | 277 | { |
275 | 278 | foreach($tables as $table) { |
@@ -288,6 +291,9 @@ discard block |
||
288 | 291 | } |
289 | 292 | } |
290 | 293 | |
294 | + /** |
|
295 | + * @param string $id |
|
296 | + */ |
|
291 | 297 | protected function deleteAlert($id) |
292 | 298 | { |
293 | 299 | $delete = $this->auraFactory->newDelete(); |
@@ -89,7 +89,7 @@ |
||
89 | 89 | $query->cols(['*']); |
90 | 90 | $query->from('ws_players_total'); |
91 | 91 | if ($server != 0) { |
92 | - $query->where("playerServer = ?", $server); |
|
92 | + $query->where("playerServer = ?", $server); |
|
93 | 93 | } |
94 | 94 | $query->orderBy([$metric . ' DESC']); |
95 | 95 | $query->limit($limit); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $this->playerLeaderboards($output); |
30 | 30 | |
31 | 31 | $end = microtime(true); |
32 | - $output->writeln("Processing took " . gmdate("H:i:s", ($end - $start))); |
|
32 | + $output->writeln("Processing took ".gmdate("H:i:s", ($end - $start))); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function playerLeaderboards(OutputInterface $output) |
@@ -41,16 +41,16 @@ discard block |
||
41 | 41 | 'playerSuicides', |
42 | 42 | 'headshots' |
43 | 43 | ]; |
44 | - $servers = [0,1,10,13,17,25,1000,2000]; |
|
44 | + $servers = [0, 1, 10, 13, 17, 25, 1000, 2000]; |
|
45 | 45 | |
46 | - foreach($servers as $server) { |
|
47 | - foreach($metrics as $metric) { |
|
46 | + foreach ($servers as $server) { |
|
47 | + foreach ($metrics as $metric) { |
|
48 | 48 | $this->markAsBeingUpdated($metric, $server); |
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | - foreach($servers as $server) { |
|
53 | - foreach($metrics as $metric) { |
|
52 | + foreach ($servers as $server) { |
|
53 | + foreach ($metrics as $metric) { |
|
54 | 54 | $count = 0; |
55 | 55 | $limit = 10000; |
56 | 56 | $ladderLimit = 10000; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $query->where('playerServer', $server); |
79 | 79 | } |
80 | 80 | |
81 | - $query->orderBy([$metric . ' DESC']); |
|
81 | + $query->orderBy([$metric.' DESC']); |
|
82 | 82 | $query->limit($limit); |
83 | 83 | $query->offset($count); |
84 | 84 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $playerPosKey = "ps2alerts:api:leaderboards:players:pos:{$player->playerID}"; |
94 | 94 | |
95 | 95 | // If player record doesn't exist |
96 | - if (! $this->redis->exists($playerPosKey)) { |
|
96 | + if (!$this->redis->exists($playerPosKey)) { |
|
97 | 97 | $data = [ |
98 | 98 | 'id' => $player->playerID, |
99 | 99 | 'updated' => date('U', strtotime('now')) |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | |
105 | 105 | // For first time running |
106 | - if (! empty($data[$server][$metric])) { |
|
106 | + if (!empty($data[$server][$metric])) { |
|
107 | 107 | $data[$server][$metric]['old'] = $data[$server][$metric]['new']; |
108 | 108 | } else { |
109 | 109 | $data[$server][$metric]['old'] = 0; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $key = "ps2alerts:api:leaderboards:status:{$metric}:{$server}"; |
130 | 130 | |
131 | 131 | // Create the key if it doesn't exist for some reason (1st runs) |
132 | - if (! $this->redis->exists($key)) { |
|
132 | + if (!$this->redis->exists($key)) { |
|
133 | 133 | $data = [ |
134 | 134 | 'beingUpdated' => 1, |
135 | 135 | 'lastUpdated' => 'never' |