@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ps2alerts\Api\Loader\Statistics\AbstractStatisticsLoader; |
6 | 6 | use Ps2alerts\Api\QueryObjects\QueryObject; |
7 | 7 | use Ps2alerts\Api\Repository\AlertRepository; |
8 | -use Ps2alerts\Api\Validator\AlertInputValidator; |
|
9 | 8 | use Ps2alerts\Api\Helper\DataFormatterHelper; |
10 | 9 | |
11 | 10 | class AlertStatisticsLoader extends AbstractStatisticsLoader |
@@ -31,7 +31,7 @@ |
||
31 | 31 | * |
32 | 32 | * @param \Ps2alerts\Api\Repository\AlertRepository $repository |
33 | 33 | * @param \Ps2alerts\Api\Loader\Metrics\MapMetricsLoader $mapLoader |
34 | - * @param \Ps2alerts\Api\Helper\DataFormatter $dataFormatter |
|
34 | + * @param DataFormatterHelper $dataFormatter |
|
35 | 35 | */ |
36 | 36 | public function __construct( |
37 | 37 | AlertRepository $repository, |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | return $this->getFromRedis($masterRedisKey); |
94 | 94 | } |
95 | 95 | |
96 | - $servers = [1,10,13,17,25,1000,2000]; |
|
97 | - $zones = [2,4,6,8]; |
|
98 | - $factions = ['vs','nc','tr','draw']; |
|
96 | + $servers = [1, 10, 13, 17, 25, 1000, 2000]; |
|
97 | + $zones = [2, 4, 6, 8]; |
|
98 | + $factions = ['vs', 'nc', 'tr', 'draw']; |
|
99 | 99 | |
100 | 100 | $results = []; |
101 | 101 | $this->setCacheExpireTime(3600); // 1 Hour |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $maxDate = date('Y-m-d'); // Today unless set |
188 | 188 | |
189 | 189 | // If there is a minimum date set |
190 | - if (! empty($post['wheres']['morethan']['ResultEndTime'])) { |
|
190 | + if (!empty($post['wheres']['morethan']['ResultEndTime'])) { |
|
191 | 191 | if (is_integer($post['wheres']['morethan']['ResultEndTime'])) { |
192 | 192 | $minDate = date('Y-m-d', $post['wheres']['morethan']['ResultEndTime']); |
193 | 193 | } else { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | // If there is a maximum date set |
199 | - if (! empty($post['wheres']['lessthan']['ResultEndTime'])) { |
|
199 | + if (!empty($post['wheres']['lessthan']['ResultEndTime'])) { |
|
200 | 200 | if (is_integer($post['wheres']['lessthan']['ResultEndTime'])) { |
201 | 201 | $maxDate = date('Y-m-d', $post['wheres']['lessthan']['ResultEndTime']); |
202 | 202 | } else { |
@@ -254,11 +254,11 @@ discard block |
||
254 | 254 | $minDate = date('U', strtotime("-24 hours")); |
255 | 255 | $maxDate = date('U'); |
256 | 256 | |
257 | - if (! empty($post['minDate'])) { |
|
257 | + if (!empty($post['minDate'])) { |
|
258 | 258 | $minDate = date('U', $post['minDate']); |
259 | 259 | } |
260 | 260 | |
261 | - if (! empty($post['maxDate'])) { |
|
261 | + if (!empty($post['maxDate'])) { |
|
262 | 262 | $maxDate = date('U', $post['maxDate']); |
263 | 263 | } |
264 | 264 | |
@@ -274,14 +274,14 @@ discard block |
||
274 | 274 | 'value' => $maxDate |
275 | 275 | ]); |
276 | 276 | |
277 | - if (! empty($post['server'])) { |
|
277 | + if (!empty($post['server'])) { |
|
278 | 278 | $queryObject->addWhere([ |
279 | 279 | 'col' => 'ResultServer', |
280 | 280 | 'value' => $post['server'] |
281 | 281 | ]); |
282 | 282 | } |
283 | 283 | |
284 | - if (! empty($post['faction'])) { |
|
284 | + if (!empty($post['faction'])) { |
|
285 | 285 | $queryObject->addWhere([ |
286 | 286 | 'col' => 'ResultWinner', |
287 | 287 | 'value' => $post['faction'] |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $queryObject->setOrderBy('result'); |
294 | 294 | $queryObject->setOrderByDirection('desc'); |
295 | 295 | |
296 | - if (! empty($post['orderBy'])) { |
|
296 | + if (!empty($post['orderBy'])) { |
|
297 | 297 | if ($post['orderBy'] === 'asc' || $post['orderBy'] === 'desc') { |
298 | 298 | $queryObject->setOrderByDirection($post['orderBy']); |
299 | 299 | } |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | $query = $this->newQuery(); |
71 | 71 | |
72 | 72 | // Setup select statements |
73 | - if (! empty($queryObject->getSelects())) { |
|
73 | + if (!empty($queryObject->getSelects())) { |
|
74 | 74 | $query->cols($queryObject->getSelects()); |
75 | 75 | } else { |
76 | 76 | $query->cols(['*']); |
77 | 77 | } |
78 | 78 | |
79 | 79 | // Workarounds :-/ |
80 | - if (! empty($queryObject->getFlags())) { |
|
80 | + if (!empty($queryObject->getFlags())) { |
|
81 | 81 | if ($queryObject->getFlags() === 'outfitIDs') { |
82 | 82 | // Prevent the VS, NC and TR "no outfit" workaround |
83 | 83 | $queryObject->addWhere([ |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | // Setup where statements |
92 | - if (! empty($queryObject->getWheres())) { |
|
92 | + if (!empty($queryObject->getWheres())) { |
|
93 | 93 | foreach ($queryObject->getWheres() as $where) { |
94 | 94 | $col = $where['col']; |
95 | 95 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | // Generate a UUID so that any columns that are used multiple |
104 | 104 | // times always have unique values. Tiny overhead for the benefit |
105 | 105 | $uuid = $this->getUuidDriver()->uuid4()->toString(); |
106 | - $bind = str_replace('-', '', $col.$uuid); |
|
106 | + $bind = str_replace('-', '', $col . $uuid); |
|
107 | 107 | |
108 | 108 | $op = (isset($where['op']) ? $where['op'] : '='); |
109 | 109 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | |
115 | 115 | // Setup where statements |
116 | - if (! empty($queryObject->getWhereIns())) { |
|
116 | + if (!empty($queryObject->getWhereIns())) { |
|
117 | 117 | foreach ($queryObject->getWhereIns() as $whereIn) { |
118 | 118 | $col = $whereIn['col']; |
119 | 119 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | // Set up order statement |
132 | - if (! empty($queryObject->getOrderBy())) { |
|
132 | + if (!empty($queryObject->getOrderBy())) { |
|
133 | 133 | $orderBy = $queryObject->getOrderBy(); |
134 | 134 | if ($orderBy === 'primary') { |
135 | 135 | $orderBy = $this->getPrimaryKey(); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | ]); |
144 | 144 | } |
145 | 145 | |
146 | - if (! empty($queryObject->getLimit())) { |
|
146 | + if (!empty($queryObject->getLimit())) { |
|
147 | 147 | // Only set a limit if it's required |
148 | 148 | if ($queryObject->getLimit() !== 'unlimited') { |
149 | 149 | $query->limit($queryObject->getLimit()); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | */ |
20 | 20 | public function register() |
21 | 21 | { |
22 | - $this->getContainer()->add('Ramsey\Uuid\Uuid', function () { |
|
22 | + $this->getContainer()->add('Ramsey\Uuid\Uuid', function() { |
|
23 | 23 | $uuid = Uuid::Uuid4(); |
24 | 24 | return $uuid; |
25 | 25 | }); |