Maelstromeous / ps2alerts-api

src/ServiceProvider/UuidServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function register()
     {
-        $this->getContainer()->add('Ramsey\Uuid\Uuid', function () {
+        $this->getContainer()->add('Ramsey\Uuid\Uuid', function() {
             $uuid = Uuid::Uuid4();
             return $uuid;
         });

tests/Endpoints/AlertControllerTest.php

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
 
 class AlertControllerTest extends \PHPUnit_Framework_TestCase
 {

src/Controller/Endpoint/AbstractEndpointController.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -342,7 +342,7 @@
                 }
 
                 if (! in_array($id, $filters)) {
-                    throw new InvalidArgumentException("Unrecognized {$mode}. Please check the IDs you sent.");
+                    throw new InvalidArgumentException("unrecognized {$mode}. Please check the IDs you sent.");
                 }
             }
 

Doc Comments +8 added lines, -21 removed lines

@@ -98,8 +98,6 @@ 
      * @param  string                                     $kind     The kind of data we wish to return
      * @param  array                                      $data     The data itself
      * @param  \League\Fractal\TransformerAbstract        $callback The transformer class to call
-     * @param  \Psr\Http\Message\ServerRequestInterface  $request  The request itself
-     * @param  \Psr\Http\Message\ResponseInterface $response The response object to eventually call
      *
      * @return \Psr\Http\Message\ResponseInterface
      */
@@ -122,9 +120,8 @@ 
      *
      * @param  array                                      $item        The item to transform
      * @param  \League\Fractal\TransformerAbstract        $transformer The Transformer to pass through to Fractal
-     * @param  \Psr\Http\Message\ResponseInterface $response    The client's response
      *
-     * @return array
+     * @return ResponseInterface
      */
     protected function respondWithItem($item, $transformer)
     {
@@ -152,9 +149,8 @@ 
      *
      * @param  array                                      $collection  The collection to transform
      * @param  \League\Fractal\TransformerAbstract        $transformer The Transformer to pass through to Fractal
-     * @param  \Psr\Http\Message\ResponseInterface $response    The client's response
      *
-     * @return array
+     * @return ResponseInterface
      */
     protected function respondWithCollection($collection, $transformer)
     {
@@ -180,7 +176,6 @@ 
     /**
      * The final step where the formatted array is now sent back as a response in JSON form
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  array                                      $array
      *
      * @return \Psr\Http\Message\ResponseInterface
@@ -210,11 +205,10 @@ 
     /**
      * Responds gracefully with an error.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message   Response message to put in the error
      * @param  int                                        $errorCode Error code to set
      *
-     * @return array
+     * @return ResponseInterface
      */
     protected function respondWithError($message, $errorCode)
     {
@@ -238,10 +232,9 @@ 
     /**
      * Generates a response with a 404 HTTP error and a given message.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message
      *
-     * @return void
+     * @return ResponseInterface
      */
     public function errorEmpty($message = 'No data / Empty')
     {
@@ -252,10 +245,9 @@ 
     /**
      * Generates a Response with a 403 HTTP header and a given message.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message
      *
-     * @return void
+     * @return ResponseInterface
      */
     public function errorForbidden($message = 'Forbidden')
     {
@@ -266,10 +258,9 @@ 
     /**
      * Generates a Response with a 500 HTTP header and a given message.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message
      *
-     * @return void
+     * @return ResponseInterface
      */
     public function errorInternalError($message = 'Internal Error')
     {
@@ -280,10 +271,9 @@ 
     /**
      * Generates a Response with a 404 HTTP header and a given message.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message
      *
-     * @return void
+     * @return ResponseInterface
      */
     public function errorNotFound($message = 'Resource Not Found')
     {
@@ -294,10 +284,9 @@ 
     /**
      * Generates a Response with a 401 HTTP header and a given message.
      *
-     * @param  \Psr\Http\Message\ResponseInterface $response
      * @param  string                                     $message
      *
-     * @return void
+     * @return ResponseInterface
      */
     public function errorUnauthorized($message = 'Unauthorized')
     {
@@ -308,7 +297,6 @@ 
     /**
      * Generates a Response with a 400 HTTP header and a given message.
      *
-     * @param \Psr\Http\Message\ResponseInterface $response
      * @param string                                     $message
      *
      * @return \Psr\Http\Message\ResponseInterface
@@ -322,7 +310,6 @@ 
     /**
      * Reads any requested includes and adds them to the item / collection
      *
-     * @param  Psr\Http\Message\ServerRequestInterface $request
      *
      * @return void
      */

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/Command/ArchiveCommand.php

Doc Comments +5 added lines, -5 removed lines

@@ -32,8 +32,8 @@ 
     /**
      * Execution
      *
-     * @param  Symfony\Component\Console\Input\InputInterface   $input
-     * @param  Symfony\Component\Console\Output\OutputInterface $output
+     * @param  InputInterface   $input
+     * @param  OutputInterface $output
      *
      * @return void
      */
@@ -47,7 +47,7 @@ 
     /**
      * Checks for alerts to be archived then runs routing against said alerts
      *
-     * @param  Symfony\Component\Console\Output\OutputInterface $output
+     * @param  OutputInterface $output
      *
      * @return void
      */
@@ -121,8 +121,8 @@ 
      * Execution of routine
      *
      * @param  array                                            $alert
-     * @param  array                                            $tables
-     * @param  Symfony\Component\Console\Output\OutputInterface $output
+     * @param  string[]                                            $tables
+     * @param  OutputInterface $output
      *
      * @return void
      */

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ArchiveCommand extends BaseCommand

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;
         }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
         $alerts = $this->alertRepo->fireStatementAndReturn($query);
         $count = count($alerts);
 
-        $output->writeln("Detected {$count} alerts to be archived");
+        $output->writeln("detected {$count} alerts to be archived");
 
         if ($count > 0) {
             $tables = [
@@ -114,7 +114,7 @@ 
             ['json' => $payload ]
         );
 
-        $output->writeln("Archived {$records} records!");
+        $output->writeln("archived {$records} records!");
     }
 
     /**
@@ -183,7 +183,7 @@ 
             $this->recordsArchived += $stm->rowCount();
             $records += $stm->rowCount();
 
-            $output->writeln("Archived {$stm->rowCount()} from Alert #{$alert['ResultID']} - Table {$table}");
+            $output->writeln("archived {$stm->rowCount()} from Alert #{$alert['ResultID']} - Table {$table}");
         }
 
         $this->db->commit();

src/Command/LeaderboardCheckCommand.php

Doc Comments +4 added lines

@@ -89,6 +89,10 @@
         }
     }
 
+    /**
+     * @param integer $server
+     * @param OutputInterface $output
+     */
     public function update($server, $output) {
         $output->writeln("Executing update for server: {$server}");
 

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Ps2alerts\Api\Command;
 
 use Ps2alerts\Api\Command\BaseCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

Spacing +3 added lines, -3 removed lines

@@ -34,13 +34,13 @@ 
         $servers = $this->config['servers'];
         $servers[] = 0;
 
-        foreach($servers as $server) {
+        foreach ($servers as $server) {
             $output->writeln("Checking Server {$server}");
 
             $key = "ps2alerts:api:leaderboards:status:{$server}";
             $resultKey = "ps2alerts:api:leaderboards:lastResult:{$server}";
 
-            if (! $this->redis->exists($key)) {
+            if (!$this->redis->exists($key)) {
                 $output->writeln("Key doesn't exist for server {$server}! Forcing!");
                 $this->update($server, $output);
                 continue;
@@ -69,7 +69,7 @@ 
             $row = $statement->fetch(\PDO::FETCH_OBJ);
             $force = false;
 
-            if (! $this->redis->exists($resultKey)) {
+            if (!$this->redis->exists($resultKey)) {
                 $force = true;
             } else {
                 $lastResult = $this->redis->get($resultKey);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $data = json_decode($this->redis->get($key), true);
 
             if ($data['beingUpdated'] == 1) {
-                $output->writeln("Server {$server} is currently being updated. Deferring.");
+                $output->writeln("server {$server} is currently being updated. Deferring.");
                 continue;
             }
 

src/Command/LeaderboardOutfitsCommand.php

Doc Comments +8 added lines

@@ -120,6 +120,10 @@ 
         }
     }
 
+    /**
+     * @param string $metric
+     * @param integer $server
+     */
     public function markAsBeingUpdated($metric, $server)
     {
         $key = "ps2alerts:api:leaderboards:status:{$metric}:{$server}";
@@ -139,6 +143,10 @@ 
         $this->redis->set($key, json_encode($data));
     }
 
+    /**
+     * @param string $metric
+     * @param integer $server
+     */
     public function markAsComplete($metric, $server)
     {
         $key = "ps2alerts:api:leaderboards:status:{$metric}:{$server}";

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Ps2alerts\Api\Command;
 
 use Ps2alerts\Api\Command\BaseCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
         $this->playerLeaderboards($output);
 
         $end = microtime(true);
-        $output->writeln("Processing took " . gmdate("H:i:s", ($end - $start)));
+        $output->writeln("Processing took ".gmdate("H:i:s", ($end - $start)));
     }
 
     public function playerLeaderboards(OutputInterface $output)
@@ -41,16 +41,16 @@ 
             'playerSuicides',
             'headshots'
         ];
-        $servers = [0,1,10,13,17,25,1000,2000];
+        $servers = [0, 1, 10, 13, 17, 25, 1000, 2000];
 
-        foreach($servers as $server) {
-            foreach($metrics as $metric) {
+        foreach ($servers as $server) {
+            foreach ($metrics as $metric) {
                 $this->markAsBeingUpdated($metric, $server);
             }
         }
 
-        foreach($servers as $server) {
-            foreach($metrics as $metric) {
+        foreach ($servers as $server) {
+            foreach ($metrics as $metric) {
                 $count = 0;
                 $limit = 10000;
                 $ladderLimit = 10000;
@@ -78,7 +78,7 @@ 
                         $query->where('playerServer', $server);
                     }
 
-                    $query->orderBy([$metric . ' DESC']);
+                    $query->orderBy([$metric.' DESC']);
                     $query->limit($limit);
                     $query->offset($count);
 
@@ -93,7 +93,7 @@ 
                         $playerPosKey = "ps2alerts:api:leaderboards:players:pos:{$player->playerID}";
 
                         // If player record doesn't exist
-                        if (! $this->redis->exists($playerPosKey)) {
+                        if (!$this->redis->exists($playerPosKey)) {
                             $data = [
                                 'id'      => $player->playerID,
                                 'updated' => date('U', strtotime('now'))
@@ -103,7 +103,7 @@ 
                         }
 
                         // For first time running
-                        if (! empty($data[$server][$metric])) {
+                        if (!empty($data[$server][$metric])) {
                             $data[$server][$metric]['old'] = $data[$server][$metric]['new'];
                         } else {
                             $data[$server][$metric]['old'] = 0;
@@ -129,7 +129,7 @@ 
         $key = "ps2alerts:api:leaderboards:status:{$metric}:{$server}";
 
         // Create the key if it doesn't exist for some reason (1st runs)
-        if (! $this->redis->exists($key)) {
+        if (!$this->redis->exists($key)) {
             $data = [
                 'beingUpdated' => 1,
                 'lastUpdated'  => 'never'

src/Command/LeaderboardPlayersCommand.php

Doc Comments +6 added lines

@@ -184,6 +184,9 @@ 
         }
     }
 
+    /**
+     * @param string $metric
+     */
     public function markAsBeingUpdated($metric, $server)
     {
         $key = "ps2alerts:api:leaderboards:status:{$server}";
@@ -205,6 +208,9 @@ 
         $this->redis->set($key, json_encode($data));
     }
 
+    /**
+     * @param string $metric
+     */
     public function markMetricAsComplete($metric, $server)
     {
         $key = "ps2alerts:api:leaderboards:status:{$server}";

Spacing +11 added lines, -11 removed lines

@@ -31,7 +31,7 @@ 
         $this->playerLeaderboards($input, $output);
 
         $end = microtime(true);
-        $output->writeln("Processing took " . gmdate("H:i:s", ($end - $start)));
+        $output->writeln("Processing took ".gmdate("H:i:s", ($end - $start)));
     }
 
     public function playerLeaderboards(InputInterface $input, OutputInterface $output)
@@ -47,19 +47,19 @@ 
 
         // Allows server 0, meaning all servers but not to process every server
         if ($serverArg === 'all') {
-            $servers = [0,1,10,13,17,25,1000,2000];
+            $servers = [0, 1, 10, 13, 17, 25, 1000, 2000];
         } else {
             $servers = [$serverArg];
         }
 
-        foreach($servers as $server) {
-            foreach($metrics as $metric) {
+        foreach ($servers as $server) {
+            foreach ($metrics as $metric) {
                 $this->markAsBeingUpdated($metric, $server);
             }
         }
 
-        foreach($servers as $server) {
-            foreach($metrics as $metric) {
+        foreach ($servers as $server) {
+            foreach ($metrics as $metric) {
                 $count = 0;
                 $limit = 10000;
                 $ladderLimit = 10000;
@@ -89,7 +89,7 @@ 
                     if ($server != 0) {
                          $query->where("playerServer = ?", $server);
                     }
-                    $query->orderBy([$metric . ' DESC']);
+                    $query->orderBy([$metric.' DESC']);
                     $query->limit($limit);
                     $query->offset($count);
 
@@ -104,7 +104,7 @@ 
                         $playerPosKey = "ps2alerts:api:leaderboards:players:pos:{$player->playerID}";
 
                         // If player record doesn't exist
-                        if (! $this->redis->exists($playerPosKey)) {
+                        if (!$this->redis->exists($playerPosKey)) {
                             $data = [
                                 'updated' => [
                                     'daily'   => date('U'),
@@ -122,7 +122,7 @@ 
                             'monthly'
                         ];
 
-                        foreach($deadlines as $deadline) {
+                        foreach ($deadlines as $deadline) {
                             // Create the array if empty
                             if (empty($data[$server][$metric][$deadline])) {
                                 $data[$server][$metric][$deadline] = [];
@@ -138,7 +138,7 @@ 
                             }
 
                             // Flip new to old
-                            if (! empty($row)) {
+                            if (!empty($row)) {
                                 $row['old']['pos'] = $row['new']['pos'];
                                 $row['old']['val'] = $row['new']['val'];
                             }
@@ -189,7 +189,7 @@ 
         $key = "ps2alerts:api:leaderboards:status:{$server}";
 
         // Create the key if it doesn't exist for some reason (1st runs)
-        if (! $this->redis->exists($key)) {
+        if (!$this->redis->exists($key)) {
             $data = [
                 'beingUpdated' => 1,
                 'lastUpdated'  => date('U'),

Indentation +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
                     $query->cols(['*']);
                     $query->from('ws_players_total');
                     if ($server != 0) {
-                         $query->where("playerServer = ?", $server);
+                            $query->where("playerServer = ?", $server);
                     }
                     $query->orderBy([$metric . ' DESC']);
                     $query->limit($limit);

src/Contract/HttpMessageAwareTrait.php

Doc Comments +1 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * Set the http message request
      *
-     * @param \Zend\Diactoros\ServerRequestFactory $obj
+     * @param ServerRequest $obj
      */
     public function setRequest(ServerRequest $obj)
     {
@@ -30,7 +30,6 @@ 
     /**
      * Getthe http message request
      *
-     * @param \Zend\Diactoros\ServerRequestFactory $obj
      */
     public function getRequest()
     {

src/Controller/Endpoint/Alerts/AlertCombatEndpointController.php

Doc Comments +7 added lines, -1 removed lines

@@ -24,7 +24,7 @@ 
      * Retrieves combat totals on a global and per-server basis
      * @param  ServerRequestInterface $request
      * @param  ResponseInterface      $response
-     * @return array
+     * @return ResponseInterface
      */
     public function getCombatTotals(ServerRequestInterface $request, ResponseInterface $response)
     {
@@ -250,6 +250,9 @@ 
         return $this->respondWithArray($results);
     }
 
+    /**
+     * @param integer $classID
+     */
     private function findClassGrouping($classID)
     {
         $classGroups = $this->getConfig()['classesGroups'];
@@ -265,6 +268,9 @@ 
         return false;
     }
 
+    /**
+     * @param integer $classID
+     */
     private function findClassFaction($classID)
     {
         $classesFactions = $this->getConfig()['classesFactions'];

Unused Use Statements -3 removed lines

@@ -2,11 +2,8 @@
 
 namespace Ps2alerts\Api\Controller\Endpoint\Alerts;
 
-use League\Fractal\Manager;
 use Ps2alerts\Api\Controller\Endpoint\Alerts\AlertEndpointController;
 use Ps2alerts\Api\Exception\InvalidArgumentException;
-use Ps2alerts\Api\Repository\Metrics\CombatRepository;
-use Ps2alerts\Api\Repository\Metrics\ClassRepository;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 

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;