Maelstromeous / ps2alerts-api

src/Command/DeleteAlertCommand.php

Spacing +4 added lines, -4 removed lines

@@ -194,7 +194,7 @@ 
     ) {
         // Check each cols to make sure we handle SUM(BLAH) AS BLAH issues
 
-        foreach($cols as $key => $col) {
+        foreach ($cols as $key => $col) {
             if (strpos($col, 'AS ') !== false) {
                 $pos = strrpos($col, 'AS ') + 3; // Plus 3 for "AS "
                 $len = strlen($col);
@@ -210,7 +210,7 @@ 
         $query->from($table);
         $query->where('resultID = ?', $id);
 
-        if (! empty($groupBy)) {
+        if (!empty($groupBy)) {
             $query->groupBy($groupBy);
         }
 
@@ -226,7 +226,7 @@ 
             $update->table($totalsTable);
             $update->where("{$filter} = ?", $row->$filter);
 
-            foreach($fields as $field) {
+            foreach ($fields as $field) {
                 $update->set($field, "{$field} - {$row->$field}");
             }
 
@@ -239,7 +239,7 @@ 
 
     protected function deleteAllFromTables(array $tables, $id, OutputInterface $output)
     {
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             $delete = $this->auraFactory->newDelete();
             $delete->from($table);
             $delete->where('resultID = ?', $id);

src/Command/ArchiveCommand.php

Spacing +9 added lines, -9 removed lines

@@ -61,11 +61,11 @@ 
         $query->where('ResultStartTime < ?', $obj->format('U'));
         $query->where('Archived = 0');
 
-        if (! empty($input->getArgument('start'))) {
+        if (!empty($input->getArgument('start'))) {
             $query->where('ResultID >= ?', $input->getArgument('start'));
         }
 
-        if (! empty($input->getArgument('process'))) {
+        if (!empty($input->getArgument('process'))) {
             $query->where('ResultID <= ?', $input->getArgument('process'));
         }
 
@@ -90,7 +90,7 @@ 
                 'ws_xp'
             ];
 
-            for ($i=0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {
                 $this->archive($alerts[$i], $tables, $output);
 
                 $per = ($i / $count) * 100;
@@ -111,7 +111,7 @@ 
         $this->guzzle->request(
             'POST',
             'https://hooks.slack.com/services/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',
-            ['json' => $payload ]
+            ['json' => $payload]
         );
 
         $output->writeln("Archived {$records} records!");
@@ -133,7 +133,7 @@ 
         $this->dbArchive->beginTransaction();
 
         // Get all data and insert it into the archive DB
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             $output->writeln("Alert #{$alert['ResultID']} - Table: {$table}");
 
             $sql = "SELECT * FROM {$table} WHERE resultID = :result";
@@ -155,7 +155,7 @@ 
                 }
 
                 $values = rtrim($values, ',');
-                $sql  = "INSERT INTO {$table} ({$cols}) VALUES {$values}";
+                $sql = "INSERT INTO {$table} ({$cols}) VALUES {$values}";
 
                 $this->dbArchive->exec($sql);
             }
@@ -175,7 +175,7 @@ 
         $this->db->beginTransaction();
 
         // Loop through all tables and delete the alert's data from the DB
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             $sql = "DELETE FROM {$table} WHERE resultID = :result";
             $stm = $this->db->prepare($sql);
             $stm->execute(['result' => $alert['ResultID']]);
@@ -207,7 +207,7 @@ 
     public function buildCols($row)
     {
         $keys = [];
-        foreach($row as $key => $val) {
+        foreach ($row as $key => $val) {
             $keys[] = (string) $key;
         }
 
@@ -224,7 +224,7 @@ 
     public function buildValues($row)
     {
         $values = [];
-        foreach($row as $key => $val) {
+        foreach ($row as $key => $val) {
             $val = str_replace("'", '', $val); // Remove any apostophies from char names
             $values[] = $val;
         }

src/Controller/Endpoint/Data/DataEndpointController.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
         }
 
         // Now return the character the outfit injected
-        if (! empty($character['data']['outfit'])) {
+        if (!empty($character['data']['outfit'])) {
             try {
                 $outfit = $this->getOutfit($character['data']['outfit']);
             } catch (CensusErrorException $e) {
@@ -138,7 +138,7 @@ 
         // First, check if we have the character in Redis
         $redisCheck = $this->checkRedis('cache', 'character', $id);
 
-        if (! empty($redisCheck)) {
+        if (!empty($redisCheck)) {
             return $redisCheck;
         }
 
@@ -187,7 +187,7 @@ 
         // First, check if we have the outfit in Redis
         $redisCheck = $this->checkRedis('cache', 'outfit', $id);
 
-        if (! empty($redisCheck)) {
+        if (!empty($redisCheck)) {
             return $redisCheck;
         }
 
@@ -244,7 +244,7 @@ 
         ];
 
         // Loop through each environment and get the first result
-        foreach($environments as $env) {
+        foreach ($environments as $env) {
             $url = "https://census.daybreakgames.com/s:{$config['census_service_id']}/get/{$env}/{$endpoint}";
 
             $req  = $guzzle->request('GET', $url);

src/Controller/Endpoint/Leaderboards/LeaderboardLadderEndpointController.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
         $data = [];
 
-        foreach($config['servers'] as $server) {
+        foreach ($config['servers'] as $server) {
             $key = "ps2alerts:api:leaderboards:status:{$server}";
 
             if ($redis->exists($key)) {

src/Controller/Endpoint/Leaderboards/LeaderboardEndpointController.php

Spacing +12 added lines, -12 removed lines

@@ -83,7 +83,7 @@ 
             }
         }
 
-        if (! isset($field)) {
+        if (!isset($field)) {
             return $this->errorWrongArgs('Field wasn\'t provided and is required.');
         }
 
@@ -112,7 +112,7 @@ 
 
         // Gets outfit details
         for ($i = 0; $i < $count; $i++) {
-            if (! empty($players[$i]['playerOutfit'])) {
+            if (!empty($players[$i]['playerOutfit'])) {
                 // Gets outfit details
                 try {
                     $outfit = $this->dataEndpoint->getOutfit($players[$i]['playerOutfit']);
@@ -176,7 +176,7 @@ 
             }
         }
 
-        if (! isset($field)) {
+        if (!isset($field)) {
             return $this->errorWrongArgs('Field wasn\'t provided and is required.');
         }
 
@@ -239,7 +239,7 @@ 
             }
         }
 
-        if (! isset($field)) {
+        if (!isset($field)) {
             return $this->errorWrongArgs('Field wasn\'t provided and is required.');
         }
 
@@ -282,19 +282,19 @@ 
     public function validateRequestVars($request)
     {
         try {
-            if (! empty($_GET['field'])) {
+            if (!empty($_GET['field'])) {
                 $this->parseField($_GET['field']);
             }
 
-            if (! empty($_GET['server'])) {
+            if (!empty($_GET['server'])) {
                 $this->parseServer($_GET['server']);
             }
 
-            if (! empty($_GET['limit'])) {
+            if (!empty($_GET['limit'])) {
                 $this->parseOffset($_GET['limit']);
             }
 
-            if (! empty($_GET['offset'])) {
+            if (!empty($_GET['offset'])) {
                 $this->parseOffset($_GET['offset']);
             }
         } catch (InvalidArgumentException $e) {
@@ -320,7 +320,7 @@ 
             'captures'
         ];
 
-        if (! empty($field) && in_array($field, $validFields)) {
+        if (!empty($field) && in_array($field, $validFields)) {
             return $field;
         }
 
@@ -341,7 +341,7 @@ 
             unset($validServers[$key]);
         }
 
-        if (! empty($server) && in_array($server, $validServers)) {
+        if (!empty($server) && in_array($server, $validServers)) {
             return $server;
         }
 
@@ -355,7 +355,7 @@ 
      */
     public function parseLimit($limit)
     {
-        if (! isset($limit) && ! is_numeric($limit)) {
+        if (!isset($limit) && !is_numeric($limit)) {
             throw new InvalidArgumentException("Limit needs to be in numerical format.");
         }
 
@@ -367,7 +367,7 @@ 
      */
     public function parseOffset($offset)
     {
-        if (! isset($offset) && ! is_numeric($offset)) {
+        if (!isset($offset) && !is_numeric($offset)) {
             throw new InvalidArgumentException("Offset needs to be in numerical format.");
         }
 

src/Controller/Endpoint/ContextualDataEndpointController.php

Spacing +1 added lines, -1 removed lines

@@ -22,6 +22,6 @@
     public function __construct(
         Manager          $fractal
     ) {
-        $this->fractal     = $fractal;
+        $this->fractal = $fractal;
     }
 }

src/Controller/Endpoint/Search/SearchEndpointController.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
         if ($this->parsePlayerName($args['term'], $response)) {
             $players = $this->searchForPlayer($args['term']);
 
-            if (! empty($players)) {
+            if (!empty($players)) {
                 return $this->respond(
                     'collection',
                     $players,
@@ -81,7 +81,7 @@ 
         if ($this->parseOutfitName($name, $response)) {
             $outfits = $this->searchForOutfit($name);
 
-            if (! empty($outfits)) {
+            if (!empty($outfits)) {
                 return $this->respond(
                     'collection',
                     $outfits,
@@ -199,7 +199,7 @@ 
             return $this->errorWrongArgs('Player ID cannot be longer than 19 characters.');
         }
 
-        if (! is_numeric($id)) {
+        if (!is_numeric($id)) {
             return $this->errorWrongArgs('Player ID must be numeric.');
         }
 

src/Controller/Endpoint/AbstractEndpointController.php

Spacing +7 added lines, -7 removed lines

@@ -328,7 +328,7 @@ 
      */
     public function getIncludesFromRequest()
     {
-        if (! empty($_GET['embed'])) {
+        if (!empty($_GET['embed'])) {
             $this->fractal->parseIncludes($_GET['embed']);
         }
     }
@@ -408,7 +408,7 @@ 
             throw new \Exception();
         }
 
-        if (! $time) {
+        if (!$time) {
             $time = 3600 * 24; // 1 day
         }
 
@@ -432,14 +432,14 @@ 
         $numericals = ['servers', 'zones'];
         $strings = ['factions', 'brackets'];
 
-        if (! empty($queryString)) {
+        if (!empty($queryString)) {
             $check = explode(',', $queryString);
 
             // Run a check on the IDs provided to make sure they're valid and no naughty things are being passed
             foreach ($check as $id) {
                 // If the query string should contain only numbers
                 if (in_array($mode, $numericals)) {
-                    if (! is_numeric($id)) {
+                    if (!is_numeric($id)) {
                         throw new InvalidArgumentException("Non numerical ID detected. Only numerical IDs are accepted with this request.");
                     }
                 }
@@ -449,14 +449,14 @@ 
                     }
                 }
 
-                if (! in_array($id, $filters)) {
+                if (!in_array($id, $filters)) {
                     throw new InvalidArgumentException("Unrecognized {$mode}. Please check the IDs you sent.");
                 }
             }
 
             // Format into strings comma seperated for SQL
             if (in_array($mode, $strings)) {
-                $queryString = "'" . implode("','", $check) . "'";
+                $queryString = "'".implode("','", $check)."'";
             }
 
             return $queryString;
@@ -465,7 +465,7 @@ 
         $return = implode(',', $filters);
 
         if (in_array($mode, $strings)) {
-            $return = "'" . implode("','", $filters) . "'";
+            $return = "'".implode("','", $filters)."'";
         }
 
         // If no string was provided, returns all data encoded as a comma seperated string

src/Controller/Endpoint/Alerts/AlertCombatEndpointController.php

Spacing +13 added lines, -13 removed lines

@@ -49,23 +49,23 @@ 
             $data = $this->checkRedis('api', 'combatTotals', "{$server}-data");
             $dataArchive = $this->checkRedis('api', 'combatTotals', "{$server}-dataArchive");
 
-            if (! $data || ! $dataArchive) {
+            if (!$data || !$dataArchive) {
                 $sums = [];
                 foreach ($metrics as $metric) {
                     foreach ($factions as $faction) {
-                        $dbMetric = $metric . strtoupper($faction); // e.g. killsVS
-                        $dataMetric = $metric . strtoupper($faction); // e.g. killsVS
+                        $dbMetric = $metric.strtoupper($faction); // e.g. killsVS
+                        $dataMetric = $metric.strtoupper($faction); // e.g. killsVS
 
                         // Handle teamkills inconsistency
                         if ($metric === 'teamkills') {
-                            $dbMetric = 'teamKills' . strtoupper($faction);
+                            $dbMetric = 'teamKills'.strtoupper($faction);
                         }
                         $sums[] = "SUM(factions.{$dbMetric}) AS $dataMetric";
                     }
 
                     // Totals
-                    $dbMetric = 'total' . ucfirst($metric); // e.g. killsVS
-                    $dataMetric = 'total' . ucfirst($metric); // e.g. killsVS
+                    $dbMetric = 'total'.ucfirst($metric); // e.g. killsVS
+                    $dataMetric = 'total'.ucfirst($metric); // e.g. killsVS
 
                     // Handle teamkills inconsistency
                     if ($metric === 'teamkills') {
@@ -100,12 +100,12 @@ 
             // Merge the two arrays together
             foreach ($metrics as $metric) {
                 // Tot up totals
-                $dbMetric = 'total' . ucfirst($metric);
+                $dbMetric = 'total'.ucfirst($metric);
                 $mergedArray['totals'][$metric] = (int) $data[$dbMetric] + (int) $dataArchive[$dbMetric];
                 $results['all']['totals'][$metric] += $mergedArray['totals'][$metric];
 
                 foreach ($factions as $faction) {
-                    $dbMetric = $metric . strtoupper($faction);
+                    $dbMetric = $metric.strtoupper($faction);
                     $mergedArray[$metric][$faction] = (int) $data[$dbMetric] + (int) $dataArchive[$dbMetric];
                     $results['all'][$metric][$faction] += $mergedArray[$metric][$faction];
                 }
@@ -148,7 +148,7 @@ 
             $dataArchive = $this->checkRedis('api', 'classCombat', "{$server}-dataArchive", 'object');
 
             // If data needs a pull
-            if (! $data || ! $dataArchive) {
+            if (!$data || !$dataArchive) {
                 $query = $this->combatRepository->newQuery('single', true);
                 $query->cols([
                         'classID',
@@ -181,8 +181,8 @@ 
             // Typecase into ints and increase totals
             $metrics = ['kills', 'deaths', 'teamkills', 'suicides'];
             foreach ($data as $row) {
-                $row->classID   = (int) $row->classID;
-                $row->server   = (int) $row->server;
+                $row->classID = (int) $row->classID;
+                $row->server = (int) $row->server;
                 $classGroup = $this->findClassGrouping($row->classID);
                 $faction = $this->findClassFaction($row->classID);
 
@@ -201,8 +201,8 @@ 
             }
 
             foreach ($dataArchive as $row) {
-                $row->classID   = (int) $row->classID;
-                $row->server   = (int) $row->server;
+                $row->classID = (int) $row->classID;
+                $row->server = (int) $row->server;
 
                 foreach ($metrics as $metric) {
                     $row->$metric = (int) $row->$metric;