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

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

src/Command/LeaderboardCheckCommand.php

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

src/Controller/Endpoint/Alerts/AlertCombatEndpointController.php

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;

src/Controller/Endpoint/Alerts/AlertEndpointController.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use League\Fractal\Manager;
 use Ps2alerts\Api\Controller\Endpoint\AbstractEndpointController;
 use Ps2alerts\Api\Repository\AlertRepository;
-use Ps2alerts\Api\Transformer\AlertTotalTransformer;
 use Ps2alerts\Api\Transformer\AlertTransformer;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;

Spacing +4 added lines, -4 removed lines

@@ -103,11 +103,11 @@ 
         $limit    = (int) $_GET['limit'];
 
         // Set defaults if not supplied
-        if (empty($offset) || ! is_numeric($offset)) {
+        if (empty($offset) || !is_numeric($offset)) {
             $offset = 0;
         }
 
-        if (empty($limit) || ! is_numeric($limit)) {
+        if (empty($limit) || !is_numeric($limit)) {
             $limit = 50;
         }
 
@@ -173,11 +173,11 @@ 
         $limit  = (int) $_GET['limit'];
 
         // Set defaults if not supplied
-        if (empty($offset) || ! is_numeric($offset)) {
+        if (empty($offset) || !is_numeric($offset)) {
             $offset = 0;
         }
 
-        if (empty($limit) || ! is_numeric($limit)) {
+        if (empty($limit) || !is_numeric($limit)) {
             $limit = 50;
         }
 

src/Controller/Endpoint/ContextualDataEndpointController.php

Unused Use Statements -3 removed lines

@@ -5,10 +5,7 @@
 use League\Fractal\Manager;
 use Ps2alerts\Api\Controller\Endpoint\AbstractEndpointController;
 use Ps2alerts\Api\Repository\AlertRepository;
-use Ps2alerts\Api\Transformer\AlertTotalTransformer;
 use Ps2alerts\Api\Transformer\AlertTransformer;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 
 class ContextualDataEndpointController extends AbstractEndpointController
 {

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/Leaderboards/LeaderboardEndpointController.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Ps2alerts\Api\Repository\Metrics\OutfitTotalRepository;
 use Ps2alerts\Api\Repository\Metrics\PlayerTotalRepository;
 use Ps2alerts\Api\Repository\Metrics\WeaponTotalRepository;
-use Ps2alerts\Api\Transformer\Leaderboards\LeaderboardUpdatedTransformer;
 use Ps2alerts\Api\Transformer\Leaderboards\OutfitLeaderboardTransformer;
 use Ps2alerts\Api\Transformer\Leaderboards\PlayerLeaderboardTransformer;
 use Ps2alerts\Api\Transformer\Leaderboards\WeaponLeaderboardTransformer;

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/Leaderboards/LeaderboardLadderEndpointController.php

Unused Use Statements -3 removed lines

@@ -2,10 +2,7 @@
 
 namespace Ps2alerts\Api\Controller\Endpoint\Leaderboards;
 
-use League\Fractal\Manager;
 use Ps2alerts\Api\Controller\Endpoint\AbstractEndpointController;
-use Ps2alerts\Api\Repository\Metrics\OutfitTotalRepository;
-use Ps2alerts\Api\Repository\Metrics\PlayerTotalRepository;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 

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)) {