Maelstromeous / ps2alerts-api

src/commands.php

Spacing +3 added lines, -3 removed lines

@@ -9,15 +9,15 @@
 use Ps2alerts\Api\Command\TestCommand;
 use Symfony\Component\Console\Application;
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 // ENV loading
 josegonzalez\Dotenv\Loader::load([
-    'filepath' => __DIR__ . '/../.env',
+    'filepath' => __DIR__.'/../.env',
     'toEnv'    => true
 ]);
 
-include __DIR__ . '/Command/CommandsCommon.php';
+include __DIR__.'/Command/CommandsCommon.php';
 
 $application = new Application();
 // List commands here

src/Command/BaseCommand.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
     protected function configure()
     {
-        $container = include __DIR__ . '/../container.php';
+        $container = include __DIR__.'/../container.php';
 
         $this->container   = $container;
         $this->auraFactory = $container->get('Ps2alerts\Api\Factory\AuraFactory');

src/Command/LeaderboardOutfitsCommand.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                         $query->where('playerServer', $server);
                     }
 
-                    $query->orderBy([$metric . ' DESC']);
+                    $query->orderBy([$metric.' DESC']);
                     $query->limit($limit);
                     $query->offset($count);
 

src/Controller/Endpoint/Alerts/AlertCombatEndpointController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace Ps2alerts\Api\Controller\Endpoint\Alerts;
 
 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 @@ 
 
             $mergedArray = [];
 
-            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->getRedisUtility()->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;

public/index.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-include __DIR__ . '/../vendor/autoload.php';
+include __DIR__.'/../vendor/autoload.php';
 
 use League\Route\Http\Exception\NotFoundException;
 
 // ENV loading
 josegonzalez\Dotenv\Loader::load([
-    'filepath' => __DIR__ . '/../.env',
+    'filepath' => __DIR__.'/../.env',
     'toEnv'    => true
 ]);
 
@@ -21,10 +21,10 @@ 
 }
 
 // Container
-$container = include __DIR__ . '/../src/container.php';
+$container = include __DIR__.'/../src/container.php';
 
 // Routes
-$router = include __DIR__ . '/../src/routes.php';
+$router = include __DIR__.'/../src/routes.php';
 
 // FIRE!!!
 try {
@@ -49,7 +49,7 @@ 
     if ($_ENV['ENV'] === 'development') {
         trigger_error($e->getMessage());
     } else {
-        $logger->addError(":warning: Exception IN API: \n\n" . $e->getMessage());
+        $logger->addError(":warning: Exception IN API: \n\n".$e->getMessage());
         $response = $container->get('Zend\Diactoros\Response');
 
         $response->getBody()->write(

src/Controller/Endpoint/AbstractEndpointController.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 
             // Format into strings comma separated for SQL
             if (in_array($type, $strings)) {
-                $queryString = "'" . implode("','", $values) . "'";
+                $queryString = "'".implode("','", $values)."'";
             }
 
             return $queryString;
@@ -118,7 +118,7 @@ 
         $return = implode(',', $filters);
 
         if (in_array($type, $strings)) {
-            $return = "'" . implode("','", $filters) . "'";
+            $return = "'".implode("','", $filters)."'";
         }
 
         return $return;
@@ -135,7 +135,7 @@ 
      */
     public function addDateRangeWhereClause($dates, AbstractQuery $query, $raw = false)
     {
-        if (! is_array($dates)) {
+        if (!is_array($dates)) {
             $dates = str_replace('\'', '', $dates); // Remove escaping quotes
             $dates = explode(',', $dates);
         }

src/Controller/Endpoint/Leaderboards/LeaderboardWeaponEndpointController.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             $field = $this->getField($_GET['field']);
         }
 
-        if (! isset($field)) {
+        if (!isset($field)) {
             return $this->respondWithError('Field wasn\'t provided and is required.', self::CODE_WRONG_ARGS);
         }
 

src/Controller/Endpoint/Leaderboards/LeaderboardPlayerEndpointController.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             $field = $this->getField($_GET['field']);
         }
 
-        if (! isset($field)) {
+        if (!isset($field)) {
             return $this->respondWithError('Field wasn\'t provided and is required.', self::CODE_WRONG_ARGS);
         }
 
@@ -81,7 +81,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']);

src/Controller/Endpoint/Leaderboards/AbstractLeaderboardEndpointController.php

Spacing +8 added lines, -8 removed lines

@@ -18,19 +18,19 @@ 
     public function validateRequestVars()
     {
         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) {
@@ -56,7 +56,7 @@ 
             'captures'
         ];
 
-        if (! empty($field) && in_array($field, $validFields)) {
+        if (!empty($field) && in_array($field, $validFields)) {
             return $field;
         }
 
@@ -77,7 +77,7 @@ 
             unset($validServers[$key]);
         }
 
-        if (! empty($server) && in_array($server, $validServers)) {
+        if (!empty($server) && in_array($server, $validServers)) {
             return $server;
         }
 
@@ -91,7 +91,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.");
         }
 
@@ -103,7 +103,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.");
         }