mattheworres / phpdraft

api/config/_registerServices.php

Spacing +10 added lines, -10 removed lines

@@ -16,42 +16,42 @@
   return new \PhpDraft\Domain\Services\EmailService($app);
 };
 
-$app['phpdraft.LoginUserService'] = function () use ($app) {
+$app['phpdraft.LoginUserService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\LoginUserService($app);
 };
 
-$app['phpdraft.DraftService'] = function () use ($app) {
+$app['phpdraft.DraftService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DraftService($app);
 };
 
-$app['phpdraft.RoundTimeService'] = function () use ($app) {
+$app['phpdraft.RoundTimeService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\RoundTimeService($app);
 };
 
-$app['phpdraft.ManagerService'] = function () use ($app) {
+$app['phpdraft.ManagerService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\ManagerService($app);
 };
 
-$app['phpdraft.ProPlayerService'] = function () use ($app) {
+$app['phpdraft.ProPlayerService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\ProPlayerService($app);
 };
 
-$app['phpdraft.TradeService'] = function () use ($app) {
+$app['phpdraft.TradeService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\TradeService($app);
 };
 
-$app['phpdraft.PickService'] = function () use ($app) {
+$app['phpdraft.PickService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\PickService($app);
 };
 
-$app['phpdraft.UtilityService'] = function () use ($app) {
+$app['phpdraft.UtilityService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\UtilityService($app);
 };
 
-$app['phpdraft.DepthChartPositionService'] = function () use ($app) {
+$app['phpdraft.DepthChartPositionService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DepthChartPositionService($app);
 };
 
-$app['phpdraft.DatabaseCacheService'] = function () use ($app) {
+$app['phpdraft.DatabaseCacheService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DatabaseCacheService($app);
 };
\ No newline at end of file

api/Domain/Services/DatabaseCacheService.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
   public function GetCachedItem($itemKey) {
     $cachedItem = $this->_LoadCacheObject($itemKey);
 
-    if(!$cachedItem->isHit()) {
+    if (!$cachedItem->isHit()) {
       return null;
     }
 

api/config/_app.php

Spacing +12 added lines, -12 removed lines

@@ -1,26 +1,26 @@
 <?php 
 
-require_once dirname(__FILE__).'/../../vendor/autoload.php';
+require_once dirname(__FILE__) . '/../../vendor/autoload.php';
 
 $app = new Silex\Application();
 
 //Handles settings users can define
 //Please see README.md for instructions on how to setup
-require_once dirname(__FILE__).'/../../appsettings.php';
+require_once dirname(__FILE__) . '/../../appsettings.php';
 
 $app['debug'] = DEBUG_MODE;
 
-require_once dirname(__FILE__).'/_database.php';      //Sets up database connections
-require_once dirname(__FILE__).'/_log.php';           //Sets up logging
+require_once dirname(__FILE__) . '/_database.php'; //Sets up database connections
+require_once dirname(__FILE__) . '/_log.php'; //Sets up logging
 
 //Registrations with Pimple DI
-require_once dirname(__FILE__).'/_registerServices.php';
-require_once dirname(__FILE__).'/_registerRepositories.php';
-require_once dirname(__FILE__).'/_registerValidators.php';
-require_once dirname(__FILE__).'/_registerFactories.php';
-
-require_once dirname(__FILE__).'/_middlewares.php';   //Defines middleware handlers for shared logic, like ensuring a draft is editable
-require_once dirname(__FILE__).'/_router.php';        //Sets up controller routing
-require_once dirname(__FILE__).'/_security.php';      //Sets up Symfony-based security & user authentication
+require_once dirname(__FILE__) . '/_registerServices.php';
+require_once dirname(__FILE__) . '/_registerRepositories.php';
+require_once dirname(__FILE__) . '/_registerValidators.php';
+require_once dirname(__FILE__) . '/_registerFactories.php';
+
+require_once dirname(__FILE__) . '/_middlewares.php'; //Defines middleware handlers for shared logic, like ensuring a draft is editable
+require_once dirname(__FILE__) . '/_router.php'; //Sets up controller routing
+require_once dirname(__FILE__) . '/_security.php'; //Sets up Symfony-based security & user authentication
 
 return $app;
\ No newline at end of file

api/Domain/Validators/TradeValidator.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
     $valid = true;
     $errors = array();
 
-    if($draft->draft_id != $manager->draft_id) {
+    if ($draft->draft_id != $manager->draft_id) {
       $errors[] = "Manager does not belong to draft #$draft->draft_id";
       $valid = false;
     }
@@ -33,37 +33,37 @@ 
     $assetCount = count($trade->trade_assets);
     $uniqueAssetCount = count(array_unique($trade->trade_assets));
 
-    if(empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) {
+    if (empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) {
       $errors[] = "Invalid value for trade round.";
       $valid = false;
     }
 
-    foreach($trade->trade_assets as $trade_asset) {
-      if($trade_asset->oldmanager_id != $trade->manager1_id 
+    foreach ($trade->trade_assets as $trade_asset) {
+      if ($trade_asset->oldmanager_id != $trade->manager1_id 
         && $trade_asset->oldmanager_id != $trade->manager2_id) {
         $player_id = $trade_asset->player->player_id;
         $errors[] = "Asset #$player_id does not belong to either manager.";
         $valid = false;
       }
 
-      if($trade_asset->player->draft_id != $draft->draft_id) {
+      if ($trade_asset->player->draft_id != $draft->draft_id) {
         $player_id = $trade_asset->player->player_id;
         $errors[] = "Asset #$player_id does not belong to draft #$draft->draft_id";
         $valid = false;
       }
     }
 
-    if($assetCount != $uniqueAssetCount) {
+    if ($assetCount != $uniqueAssetCount) {
       $errors[] = "One or more of the trade assets are duplicate.";
       $valid = false;
     }
 
-    if($draft->draft_id != $trade->manager1->draft_id) {
+    if ($draft->draft_id != $trade->manager1->draft_id) {
       $errors[] = "Manager 1 does not belong to draft #$draft->draft_id";
       $valid = false;
     }
 
-    if($draft->draft_id != $trade->manager2->draft_id) {
+    if ($draft->draft_id != $trade->manager2->draft_id) {
       $errors[] = "Manager 2 does not belong to draft #$draft->draft_id";
       $valid = false;
     }

api/Domain/Validators/ProPlayerValidator.php

Spacing +3 added lines, -3 removed lines

@@ -21,19 +21,19 @@
     $errors = array();
     $sports = $this->app['phpdraft.DraftDataRepository']->GetSports();
 
-    if(empty($sport)) {
+    if (empty($sport)) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if(!array_key_exists($sport, $sports)) {
+    if (!array_key_exists($sport, $sports)) {
       $errors[] = "Sport $sport is an invalid value.";
       $valid = false;
     }
 
     if (!isset($file)) {
       $valid = false;
-      $errors[] =  "Must upload a CSV file";
+      $errors[] = "Must upload a CSV file";
     } else {
       $fileErrorCode = $file->getError();
 

api/Domain/Repositories/DraftStatsRepository.php

Spacing +17 added lines, -17 removed lines

@@ -21,7 +21,7 @@ 
 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $stats);
 
-    if(!$load_stmt->execute()) {
+    if (!$load_stmt->execute()) {
       throw new \Exception("Unable to load draft stats");
     }
 
@@ -29,7 +29,7 @@ 
       return null;
     }
 
-    if(!$load_stmt->fetch()) {
+    if (!$load_stmt->fetch()) {
       throw new \Exception("Error while loading draft stats");
     }
 
@@ -103,7 +103,7 @@ 
     $insert_stmt->bindValue(':least_drafted_position', $draft_stats->least_drafted_position);
     $insert_stmt->bindValue(':least_drafted_position_count', $draft_stats->least_drafted_position_count);
 
-    if(!$insert_stmt->execute()) {
+    if (!$insert_stmt->execute()) {
       throw new \Exception("Unable to insert new draft stats row.");
     }
 
@@ -118,7 +118,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM draft_stats WHERE draft_id = ?");
     $delete_stmt->bindParam(1, $draft_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete existing stats rows.");
     }
   }
@@ -170,7 +170,7 @@ 
     $row = $stmt->fetch();
 
     $stats->shortest_avg_pick_manager_name = $row['manager_name'];
-    $stats->shortest_avg_pick_seconds = (int) $row['pick_average'];
+    $stats->shortest_avg_pick_seconds = (int)$row['pick_average'];
   }
 
   private function _LoadSlowestPick($draft_id, DraftStats &$stats) {
@@ -190,7 +190,7 @@ 
     $row = $stmt->fetch();
 
     $stats->longest_single_pick_manager_name = $row['manager_name'];
-    $stats->longest_single_pick_seconds = (int) $row['pick_max'];
+    $stats->longest_single_pick_seconds = (int)$row['pick_max'];
   }
 
   private function _LoadFastestPick($draft_id, DraftStats &$stats) {
@@ -210,7 +210,7 @@ 
     $row = $stmt->fetch();
 
     $stats->shortest_single_pick_manager_name = $row['manager_name'];
-    $stats->shortest_single_pick_seconds = (int) $row['pick_min'];
+    $stats->shortest_single_pick_seconds = (int)$row['pick_min'];
   }
 
   private function _LoadAveragePickTime($draft_id, DraftStats &$stats) {
@@ -225,7 +225,7 @@ 
 
     $row = $stmt->fetch();
 
-    $stats->average_pick_seconds = (int) $row['pick_average'];
+    $stats->average_pick_seconds = (int)$row['pick_average'];
   }
 
   private function _LoadRoundTimes(Draft $draft, DraftStats &$stats) {
@@ -243,8 +243,8 @@ 
 
     $row = $stmt->fetch();
 
-    $stats->longest_round = (int) $row['player_round'];
-    $stats->longest_round_seconds = (int) $row['round_time'];
+    $stats->longest_round = (int)$row['player_round'];
+    $stats->longest_round_seconds = (int)$row['round_time'];
 
     //Stupid that I can't just re-use the above statement. All that changes is DESC to ASC. Stupid.
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.player_round, sum( p.pick_duration ) AS round_time
@@ -261,8 +261,8 @@ 
 
     $row = $stmt->fetch();
 
-    $stats->shortest_round = (int) $row['player_round'];
-    $stats->shortest_round_seconds = (int) $row['round_time'];
+    $stats->shortest_round = (int)$row['player_round'];
+    $stats->shortest_round_seconds = (int)$row['round_time'];
 
     $stmt = $this->app['db']->prepare("SELECT p.player_round, sum( p.pick_duration ) / ? AS avg_round_time
     FROM players p
@@ -279,7 +279,7 @@ 
 
     $row = $stmt->fetch();
 
-    $stats->average_round_seconds = (int) $row['avg_round_time'];
+    $stats->average_round_seconds = (int)$row['avg_round_time'];
   }
 
   private function _LoadTeamSuperlatives($draft_id, DraftStats &$stats, $teams) {
@@ -298,7 +298,7 @@ 
     $row = $stmt->fetch();
 
     $stats->most_drafted_team = isset($row['team']) ? $teams[$row['team']] : "";
-    $stats->most_drafted_team_count = (int) $row['team_occurences'];
+    $stats->most_drafted_team_count = (int)$row['team_occurences'];
 
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.team, count(team) as team_occurences
     FROM players p
@@ -315,7 +315,7 @@ 
     $row = $stmt->fetch();
 
     $stats->least_drafted_team = isset($row['team']) ? $teams[$row['team']] : "";
-    $stats->least_drafted_team_count = (int) $row['team_occurences'];
+    $stats->least_drafted_team_count = (int)$row['team_occurences'];
   }
 
   private function _LoadPositionSuperlatives($draft_id, DraftStats &$stats, $positions) {
@@ -334,7 +334,7 @@ 
     $row = $stmt->fetch();
 
     $stats->most_drafted_position = isset($row['position']) ? $positions[$row['position']] : "";
-    $stats->most_drafted_position_count = (int) $row['position_occurences'];
+    $stats->most_drafted_position_count = (int)$row['position_occurences'];
 
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.position, count(position) as position_occurences
     FROM players p
@@ -351,6 +351,6 @@ 
     $row = $stmt->fetch();
 
     $stats->least_drafted_position = isset($row['position']) ? $positions[$row['position']] : "";
-    $stats->least_drafted_position_count = (int) $row['position_occurences'];
+    $stats->least_drafted_position_count = (int)$row['position_occurences'];
   }
 }

api/Domain/Repositories/LoginUserRepository.php

Spacing +12 added lines, -12 removed lines

@@ -85,11 +85,11 @@ 
 
     $users = array();
 
-    if(!$load_stmt->execute()) {
+    if (!$load_stmt->execute()) {
       throw new \Exception("Unable to load users.");
     }
 
-    while($user = $load_stmt->fetch()) {
+    while ($user = $load_stmt->fetch()) {
       
       $users[] = $this->_ScrubUser($user);
     }
@@ -117,7 +117,7 @@ 
       throw new \Exception("Unable to create user.");
     }
 
-    $user->id = (int) $this->app['db']->lastInsertId();
+    $user->id = (int)$this->app['db']->lastInsertId();
 
     return $user;
   }
@@ -155,7 +155,7 @@ 
 
     $result = $update_stmt->execute();
 
-    if($result == false) {
+    if ($result == false) {
       throw new \Exception("Unable to erase verification key for user.");
     }
 
@@ -166,7 +166,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM users WHERE id = ?");
     $delete_stmt->bindParam(1, $user->id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete user #$user->id");
     }
 
@@ -175,7 +175,7 @@ 
 
   public function NameIsUnique($name, $id = null) {
     $name = strtolower($name);
-    if($id == null) {
+    if ($id == null) {
       $name_stmt = $this->app['db']->prepare("SELECT name FROM users WHERE name LIKE ?");
       $name_stmt->bindParam(1, $name);
     } else {
@@ -184,7 +184,7 @@ 
       $name_stmt->bindParam(2, $id);
     }
 
-    if(!$name_stmt->execute()) {
+    if (!$name_stmt->execute()) {
       throw new \Exception(sprintf('Name %s is invalid', $name));
     }
 
@@ -192,7 +192,7 @@ 
   }
 
   public function EmailExists($email, $id = null) {
-    if($id == null) {
+    if ($id == null) {
       $email_stmt = $this->app['db']->prepare("SELECT email FROM users WHERE email = ?");
       $email_stmt->bindParam(1, $email);
     } else {
@@ -213,7 +213,7 @@ 
     $email_stmt = $this->app['db']->prepare("SELECT email FROM users WHERE email = ? LIMIT 1");
     $email_stmt->bindParam(1, $email);
 
-    if(!$email_stmt->execute()) {
+    if (!$email_stmt->execute()) {
       throw new \Exception(sprintf('Email %s is invalid', $email));
     }
 
@@ -229,11 +229,11 @@ 
 
     $users = array();
 
-    if(!$search_stmt->execute()) {
+    if (!$search_stmt->execute()) {
       throw new \Exception("Unable to load users");
     }
 
-    while($user = $search_stmt->fetch()) {
+    while ($user = $search_stmt->fetch()) {
       unset($user->enabled);
       unset($user->email);
       unset($user->password);
@@ -253,7 +253,7 @@ 
     $verification_stmt->bindParam(1, $email);
     $verification_stmt->bindParam(2, $verificationKey);
 
-    if(!$verification_stmt->execute()) {
+    if (!$verification_stmt->execute()) {
       throw new \Exception('Verification is invalid.');
     }
 

Braces +18 added lines, -12 removed lines

@@ -25,11 +25,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $email);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('Email "%s" does not exist.', $email));
+    }
 
     return $user;
   }
@@ -43,11 +45,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $id);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
     return $user;
   }
@@ -61,11 +65,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, $id);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('User #%s does not exist.', $id));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('User #%s does not exist.', $id));
+    }
 
     unset($user->enabled);
     unset($user->email);