mattheworres / phpdraft

api/Domain/Repositories/DraftDataRepository.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace PhpDraft\Domain\Repositories;
 
 use Silex\Application;
-use PhpDraft\Domain\Entities\Trade;
-use PhpDraft\Domain\Entities\TradeAsset;
 
 class DraftDataRepository {
   private $app;

Spacing +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
   }
 
   public function GetHistoricalTeams($pro_league) {
-    switch(strtolower($pro_league)) {
+    switch (strtolower($pro_league)) {
       case 'nhl':
       case'hockey':
         return $this->historical_nhl_teams;

api/Domain/Repositories/DraftRepository.php

Doc Comments +3 added lines

@@ -465,6 +465,9 @@
     return;
   }
 
+  /**
+   * @param integer $draft_id
+   */
   private function ResetDraftCache($draft_id) {
     $draft = $this->Load($draft_id, true);
   }

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
-use PhpDraft\Domain\Entities\Pick;
 
 class DraftRepository {
   private $app;

Spacing +29 added lines, -29 removed lines

@@ -36,13 +36,13 @@ 
     /*$draft_stmt->bindParam(1, $startIndex, \PDO::PARAM_INT);
     $draft_stmt->bindParam(2, $pageSize, \PDO::PARAM_INT);*/
 
-    if(!$draft_stmt->execute()) {
+    if (!$draft_stmt->execute()) {
       throw new \Exception("Unable to load drafts.");
     }
 
     $drafts = array();
 
-    while($draft = $draft_stmt->fetch()) {
+    while ($draft = $draft_stmt->fetch()) {
       $currentUserOwnsIt = !empty($current_user) && $draft->commish_id == $current_user->id;
       $currentUserIsAdmin = !empty($current_user) && $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user);
 
@@ -57,7 +57,7 @@ 
       $draft->draft_start_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_start_time);
       $draft->draft_end_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_end_time);
 
-      if(!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
+      if (!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
         $draft->is_locked = true;
         $draft = $this->ProtectPrivateDraft($draft);
       }
@@ -82,7 +82,7 @@ 
     $draft_stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Draft');
     $draft_stmt->bindParam(1, $commish_id);
 
-    if(!$draft_stmt->execute()) {
+    if (!$draft_stmt->execute()) {
       throw new \Exception("Unable to load drafts.");
     }
 
@@ -90,7 +90,7 @@ 
 
     $drafts = array();
 
-    while($draft = $draft_stmt->fetch()) {
+    while ($draft = $draft_stmt->fetch()) {
       $currentUserOwnsIt = !empty($current_user) && $draft->commish_id == $current_user->id;
       $currentUserIsAdmin = !empty($current_user) && $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user);
 
@@ -105,7 +105,7 @@ 
       $draft->draft_start_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_start_time);
       $draft->draft_end_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_end_time);
 
-      if(!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
+      if (!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
         $draft->is_locked = true;
         $draft = $this->ProtectPrivateDraft($draft);
       }
@@ -131,13 +131,13 @@ 
     $draft_stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Draft');
     $draft_stmt->bindParam(1, $commish_id);
 
-    if(!$draft_stmt->execute()) {
+    if (!$draft_stmt->execute()) {
       throw new \Exception("Unable to load drafts.");
     }
 
     $drafts = array();
 
-    while($draft = $draft_stmt->fetch()) {
+    while ($draft = $draft_stmt->fetch()) {
       $draft->draft_create_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_create_time);
       $draft->draft_start_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_start_time);
       $draft->draft_end_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_end_time);
@@ -158,13 +158,13 @@ 
 
     $draft_stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Draft');
 
-    if(!$draft_stmt->execute()) {
+    if (!$draft_stmt->execute()) {
       throw new \Exception("Unable to load drafts.");
     }
 
     $drafts = array();
 
-    while($draft = $draft_stmt->fetch()) {
+    while ($draft = $draft_stmt->fetch()) {
       $draft->draft_create_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_create_time);
       $draft->draft_start_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_start_time);
       $draft->draft_end_time = $this->app['phpdraft.UtilityService']->ConvertTimeForClientDisplay($draft->draft_end_time);
@@ -180,7 +180,7 @@ 
 
     $cachedDraft = $this->GetCachedDraft($id);
 
-    if($cachedDraft != null) {
+    if ($cachedDraft != null) {
       $draft = $cachedDraft;
     } else {
       $draft_stmt = $this->app['db']->prepare("SELECT d.*, u.Name AS commish_name FROM draft d
@@ -191,7 +191,7 @@ 
 
       $draft_stmt->bindParam(1, $id, \PDO::PARAM_INT);
 
-      if(!$draft_stmt->execute() || !$draft_stmt->fetch()) {
+      if (!$draft_stmt->execute() || !$draft_stmt->fetch()) {
         throw new \Exception("Unable to load draft");
       }
 
@@ -216,21 +216,21 @@ 
     $draft->in_progress = $this->app['phpdraft.DraftService']->DraftInProgress($draft);
     $draft->complete = $this->app['phpdraft.DraftService']->DraftComplete($draft);
 
-    if($getDraftData) {
+    if ($getDraftData) {
       $draft->sports = $this->app['phpdraft.DraftDataRepository']->GetSports();
       $draft->styles = $this->app['phpdraft.DraftDataRepository']->GetStyles();
       $draft->statuses = $this->app['phpdraft.DraftDataRepository']->GetStatuses();
       $draft->teams = $this->app['phpdraft.DraftDataRepository']->GetTeams($draft->draft_sport);
       $draft->historical_teams = $this->app['phpdraft.DraftDataRepository']->GetHistoricalTeams($draft->draft_sport);
       $draft->positions = $this->app['phpdraft.DraftDataRepository']->GetPositions($draft->draft_sport);
-      if($draft->using_depth_charts) {
+      if ($draft->using_depth_charts) {
         $draft->depthChartPositions = $this->app['phpdraft.DepthChartPositionRepository']->LoadAll($draft->draft_id);
       }
     }
 
     $draft->is_locked = false;
 
-    if(!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
+    if (!$currentUserOwnsIt && !$currentUserIsAdmin && !$draft->draft_visible && $password != $draft->draft_password) {
       $draft->is_locked = true;
       $draft = $this->ProtectPrivateDraft($draft);
     }
@@ -249,7 +249,7 @@ 
 
     $cachedDraft = $this->GetCachedDraft($id);
 
-    if($bustCache || $cachedDraft == null) {
+    if ($bustCache || $cachedDraft == null) {
       $draft_stmt = $this->app['db']->prepare("SELECT d.*, u.Name AS commish_name FROM draft d
       LEFT OUTER JOIN users u
       ON d.commish_id = u.id
@@ -259,13 +259,13 @@ 
 
       $draft_stmt->bindParam(1, $id, \PDO::PARAM_INT);
 
-      if(!$draft_stmt->execute() || !$draft_stmt->fetch()) {
+      if (!$draft_stmt->execute() || !$draft_stmt->fetch()) {
         throw new \Exception("Unable to load draft");
       }
 
       $draft->using_depth_charts = $draft->using_depth_charts == 1;
 
-      if($bustCache) {
+      if ($bustCache) {
         $this->UnsetCachedDraft($draft->draft_id);
       }
 
@@ -294,7 +294,7 @@ 
     $insert_stmt->bindParam(7, $draft->draft_password);
     $insert_stmt->bindParam(8, $draft->using_depth_charts);
 
-    if(!$insert_stmt->execute()) {
+    if (!$insert_stmt->execute()) {
       throw new \Exception("Unable to create draft.");
     }
 
@@ -326,7 +326,7 @@ 
     $update_stmt->bindParam(7, $draft->using_depth_charts);
     $update_stmt->bindParam(8, $draft->draft_id);
 
-    if(!$update_stmt->execute()) {
+    if (!$update_stmt->execute()) {
       throw new \Exception("Unable to update draft.");
     }
 
@@ -342,7 +342,7 @@ 
     $status_stmt->bindParam(1, $draft->draft_status);
     $status_stmt->bindParam(2, $draft->draft_id);
 
-    if(!$status_stmt->execute()) {
+    if (!$status_stmt->execute()) {
       throw new \Exception("Unable to update draft status.");
     }
 
@@ -357,7 +357,7 @@ 
 
     $status_stmt->bindParam(1, $draft->draft_id);
 
-    if(!$status_stmt->execute()) {
+    if (!$status_stmt->execute()) {
       throw new \Exception("Unable to update draft's stats timestamp.");
     }
 
@@ -375,7 +375,7 @@ 
     $increment_stmt->bindParam(1, $incrementedCounter);
     $increment_stmt->bindParam(2, $draft->draft_id);
 
-    if(!$increment_stmt->execute()) {
+    if (!$increment_stmt->execute()) {
       throw new \Exception("Unable to increment draft counter.");
     }
 
@@ -387,8 +387,8 @@ 
   //$next_pick can't be type-hinted - can be null
   public function MoveDraftForward(Draft $draft, $next_pick) {
     if ($next_pick !== null) {
-      $draft->draft_current_pick = (int) $next_pick->player_pick;
-      $draft->draft_current_round = (int) $next_pick->player_round;
+      $draft->draft_current_pick = (int)$next_pick->player_pick;
+      $draft->draft_current_round = (int)$next_pick->player_round;
 
       $stmt = $this->app['db']->prepare("UPDATE draft SET draft_current_pick = ?, draft_current_round = ? WHERE draft_id = ?");
       $stmt->bindParam(1, $draft->draft_current_pick);
@@ -426,7 +426,7 @@ 
 
     $reset_stmt->bindParam(1, $draft->draft_id);
 
-    if(!$reset_stmt->execute()) {
+    if (!$reset_stmt->execute()) {
       throw new \Exception("Unable to set draft to in progress.");
     }
 
@@ -436,7 +436,7 @@ 
   }
 
   public function NameIsUnique($name, $id = null) {
-    if(!empty($id)) {
+    if (!empty($id)) {
       $name_stmt = $this->app['db']->prepare("SELECT draft_name FROM draft WHERE draft_name LIKE ? AND draft_id <> ?");
       $name_stmt->bindParam(1, $name);
       $name_stmt->bindParam(2, $id);
@@ -445,7 +445,7 @@ 
       $name_stmt->bindParam(1, $name);
     }
 
-    if(!$name_stmt->execute()) {
+    if (!$name_stmt->execute()) {
       throw new \Exception("Draft name '%s' is invalid", $name);
     }
 
@@ -456,7 +456,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM draft WHERE draft_id = ?");
     $delete_stmt->bindParam(1, $draft_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete draft $draft_id.");
     }
 

api/Domain/Repositories/PickRepository.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,6 +324,9 @@ 
     return $picks;
   }
 
+  /**
+   * @param integer $draft_round
+   */
   public function LoadRoundPicks(Draft $draft, $draft_round, $sort_ascending = true, $selected = true) {
     $picks = array();
     $sortOrder = $sort_ascending ? "ASC" : "DESC";
@@ -361,7 +364,6 @@ 
 
   /**
    * Searches for picks with strict criteria, using the MATCH() and score method. Sorts by score ASC first, then pick DESC last.
-   * @param int $draft_id 
    */
   public function SearchStrict(PickSearchModel $searchModel) {
     $draft_id = (int) $searchModel->draft_id;
@@ -411,7 +413,6 @@ 
 
   /**
    * Search picks by a loose criteria that uses a LIKE %% query. Used if strict query returns 0 results. Sorts by pick DESC.
-   * @param int $draft_id 
    */
   public function SearchLoose(PickSearchModel $searchModel) {
     $draft_id = (int) $searchModel->draft_id;
@@ -475,7 +476,6 @@ 
 
   /**
    * Search picks by assuming a first + last combo was entered. Used if strict and loose queries return 0 and theres a space in the name. Sorts by pick DESC.
-   * @param int $draft_id 
    */
   public function SearchSplit(PickSearchModel $searchModel, $first_name, $last_name) {
     $draft_id = (int) $searchModel->draft_id;

Spacing +21 added lines, -21 removed lines

@@ -45,7 +45,7 @@ 
 
     $pick_stmt->setFetchMode(\PDO::FETCH_INTO, $pick);
 
-    if(!$pick_stmt->execute() || !$pick_stmt->fetch()) {
+    if (!$pick_stmt->execute() || !$pick_stmt->fetch()) {
       throw new \Exception("Unable to load pick " . $id);
     }
 
@@ -74,7 +74,7 @@ 
   public function LoadUpdatedPicks($draft_id, $pick_counter) {
     $picks = array();
     
-    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name FROM players p ".
+    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name FROM players p " .
             "LEFT OUTER JOIN managers m " .
             "ON m.manager_id = p.manager_id " .
             "WHERE p.draft_id = ? " .
@@ -85,11 +85,11 @@ 
     
     $stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Pick');
     
-    if(!$stmt->execute()) {
+    if (!$stmt->execute()) {
       throw new \Exception("Unable to load updated picks.");
     }
     
-    while($pick = $stmt->fetch()) {
+    while ($pick = $stmt->fetch()) {
       $pick->selected = strlen($pick->pick_time) > 0 && $pick->pick_duration > 0;
       $picks[] = $pick;
     }
@@ -111,7 +111,7 @@ 
     $update_stmt->bindParam(8, $pick->player_counter);
     $update_stmt->bindParam(9, $pick->player_id);
 
-    if(!$update_stmt->execute()) {
+    if (!$update_stmt->execute()) {
       throw new \Exception("Unable to update pick #$pick->player_id");
     }
 
@@ -126,7 +126,7 @@ 
     $update_stmt->bindParam(2, $pick->position_eligibility);
     $update_stmt->bindParam(3, $pick->player_id);
 
-    if(!$update_stmt->execute()) {
+    if (!$update_stmt->execute()) {
       throw new \Exception("Unable to update pick #$pick->player_id for depth chart.");
     }
 
@@ -235,7 +235,7 @@ 
   public function LoadLastPicks($draft_id, $amount) {
     $picks = array();
 
-    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name, m.manager_id FROM players p ".
+    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name, m.manager_id FROM players p " .
             "LEFT OUTER JOIN managers m " .
             "ON m.manager_id = p.manager_id " .
             "WHERE p.draft_id = ? " .
@@ -249,11 +249,11 @@ 
     
     $stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Pick');
     
-    if(!$stmt->execute()) {
+    if (!$stmt->execute()) {
       throw new Exception("Unable to load last $amount picks.");
     }
     
-    while($pick = $stmt->fetch()) {
+    while ($pick = $stmt->fetch()) {
       $pick->selected = strlen($pick->pick_time) > 0 && $pick->pick_duration > 0;
       $picks[] = $pick;
     }
@@ -264,7 +264,7 @@ 
   public function LoadNextPicks($draft_id, $currentPick, $amount) {
     $picks = array();
 
-    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name, m.manager_id FROM players p ".
+    $stmt = $this->app['db']->prepare("SELECT p.*, m.manager_name, m.manager_id FROM players p " .
             "LEFT OUTER JOIN managers m " .
             "ON m.manager_id = p.manager_id " .
             "WHERE p.draft_id = ? " .
@@ -278,11 +278,11 @@ 
     
     $stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Pick');
     
-    if(!$stmt->execute()) {
+    if (!$stmt->execute()) {
       throw new Exception("Unable to load next $amount picks.");
     }
     
-    while($pick = $stmt->fetch()) {
+    while ($pick = $stmt->fetch()) {
       $pick->selected = strlen($pick->pick_time) > 0 && $pick->pick_duration > 0;
       $pick->on_the_clock = $pick->player_pick == $currentPick;
 
@@ -293,7 +293,7 @@ 
   }
 
   public function LoadManagerPicks($manager_id, $draft = null, $selected = true) {
-    $manager_id = (int) $manager_id;
+    $manager_id = (int)$manager_id;
 
     if ($manager_id == 0) {
       throw new \Exception("Unable to get manager #" . $manager_id . "'s picks.");
@@ -364,7 +364,7 @@ 
    * @param int $draft_id 
    */
   public function SearchStrict(PickSearchModel $searchModel) {
-    $draft_id = (int) $searchModel->draft_id;
+    $draft_id = (int)$searchModel->draft_id;
     $param_number = 4;
     $players = array();
 
@@ -414,7 +414,7 @@ 
    * @param int $draft_id 
    */
   public function SearchLoose(PickSearchModel $searchModel) {
-    $draft_id = (int) $searchModel->draft_id;
+    $draft_id = (int)$searchModel->draft_id;
     $players = array();
     $param_number = 2;
     $loose_search_score = -1;
@@ -478,7 +478,7 @@ 
    * @param int $draft_id 
    */
   public function SearchSplit(PickSearchModel $searchModel, $first_name, $last_name) {
-    $draft_id = (int) $searchModel->draft_id;
+    $draft_id = (int)$searchModel->draft_id;
     $players = array();
     $param_number = 4;
     $loose_search_score = -1;
@@ -541,11 +541,11 @@ 
 
     $stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Pick');
 
-    if(!$stmt->execute()) {
+    if (!$stmt->execute()) {
         throw new \Exception("Unable to check to see if $first_name $last_name was already drafted.");
     }
 
-    while($pick = $stmt->fetch()) {
+    while ($pick = $stmt->fetch()) {
       $pick->selected = strlen($pick->pick_time) > 0 && $pick->pick_duration > 0;
       $picks[] = $pick;
     }
@@ -557,7 +557,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM players WHERE draft_id = ?");
     $delete_stmt->bindParam(1, $draft_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete picks for $draft_id.");
     }
 
@@ -577,7 +577,7 @@ 
           $managers = $ascending_managers;
           $even = false;
         } else {
-          if($descending_managers == null) {
+          if ($descending_managers == null) {
             throw new \Exception("Descending managers list is empty - unable to setup draft.");
           }
 
@@ -619,7 +619,7 @@ 
     $insert_stmt->bindParam(3, $pick->player_round);
     $insert_stmt->bindParam(4, $pick->player_pick);
 
-    if(!$insert_stmt->execute()) {
+    if (!$insert_stmt->execute()) {
       throw new \Exception("Unable to insert pick #$pick->player_pick for draft $pick->draft_id");
     }
 

Braces +17 added lines, -12 removed lines

@@ -371,11 +371,13 @@ 
     $sql = "SELECT p.*, m.manager_name, MATCH (p.first_name, p.last_name) AGAINST (?) as search_score " .
             "FROM players p LEFT OUTER JOIN managers m ON m.manager_id = p.manager_id WHERE MATCH (p.first_name, p.last_name) AGAINST (?) AND p.draft_id = ? ";
 
-    if ($searchModel->hasTeam())
-      $sql .= "AND p.team = ? ";
+    if ($searchModel->hasTeam()) {
+          $sql .= "AND p.team = ? ";
+    }
 
-    if ($searchModel->hasPosition())
-      $sql .= "AND p.position = ? ";
+    if ($searchModel->hasPosition()) {
+          $sql .= "AND p.position = ? ";
+    }
 
     $sql .= "AND p.pick_time IS NOT NULL ORDER BY search_score ASC, p.player_pick $searchModel->sort";
 
@@ -421,14 +423,17 @@ 
 
     $sql = "SELECT p.*, m.manager_name FROM players p LEFT OUTER JOIN managers m ON m.manager_id = p.manager_id WHERE p.draft_id = ? ";
 
-    if ($searchModel->hasName())
-      $sql .= "AND (p.first_name LIKE ? OR p.last_name LIKE ?)";
+    if ($searchModel->hasName()) {
+          $sql .= "AND (p.first_name LIKE ? OR p.last_name LIKE ?)";
+    }
 
-    if ($searchModel->hasTeam())
-      $sql .= "AND p.team = ? ";
+    if ($searchModel->hasTeam()) {
+          $sql .= "AND p.team = ? ";
+    }
 
-    if ($searchModel->hasPosition())
-      $sql .= "AND p.position = ? ";
+    if ($searchModel->hasPosition()) {
+          $sql .= "AND p.position = ? ";
+    }
 
     $sql .= "AND p.pick_time IS NOT NULL ORDER BY p.player_pick $searchModel->sort";
 
@@ -584,9 +589,9 @@ 
           $managers = $descending_managers;
           $even = true;
         }
+      } else {
+              $managers = $ascending_managers;
       }
-      else
-        $managers = $ascending_managers;
 
       foreach ($managers as $manager) {
         $new_pick = new Pick();

api/Domain/Repositories/ProPlayerRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 
   /**
    * Delete existing players for a given league, upload new players
-   * @param array $players Array of pro_player_object's
+   * @param array $proPlayers Array of pro_player_object's
    */
   public function SaveProPlayers($league, $proPlayers) {
     $delete_sql = "DELETE FROM pro_players WHERE league = '" . $league . "'";
@@ -140,7 +140,7 @@ 
 
    /**
    * Adds a new pro player to the DB
-   * @return boolean success whether or not the database operation succeeded.
+   * @return ProPlayer success whether or not the database operation succeeded.
    */
   private function _saveProPlayer(ProPlayer $proPlayer) {
     if ($proPlayer->pro_player_id > 0) {

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace PhpDraft\Domain\Repositories;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Entities\ProPlayer;
 
 class ProPlayerRepository {

Indentation +4 added lines, -4 removed lines

@@ -138,10 +138,10 @@
     return;
   }
 
-   /**
-   * Adds a new pro player to the DB
-   * @return boolean success whether or not the database operation succeeded.
-   */
+    /**
+     * Adds a new pro player to the DB
+     * @return boolean success whether or not the database operation succeeded.
+     */
   private function _saveProPlayer(ProPlayer $proPlayer) {
     if ($proPlayer->pro_player_id > 0) {
       throw new \Exception("Unable to save pro player: invalid ID.");

Spacing +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
         throw new \Exception("Unable to save pro player.");
       }
 
-      $proPlayer->draft_id = (int) $this->app['db']->lastInsertId();
+      $proPlayer->draft_id = (int)$this->app['db']->lastInsertId();
 
       return $proPlayer;
     }

api/Domain/Services/DraftService.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Models\PhpDraftResponse;
 use PhpDraft\Domain\Models\DepthChartPositionCreateModel;

Braces +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -55,7 +55,7 @@ 
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -85,7 +85,7 @@ 
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }

Spacing +8 added lines, -8 removed lines

@@ -28,13 +28,13 @@ 
     try {
       $draft = $this->app['phpdraft.DraftRepository']->Create($draft);
 
-      if($draft->using_depth_charts) {
+      if ($draft->using_depth_charts) {
         $depth_charts = $this->app['phpdraft.DepthChartPositionRepository']->Save($depthChartModel, $draft->draft_id);
       }
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -48,14 +48,14 @@ 
     try {
       $draft = $this->app['phpdraft.DraftRepository']->Update($draft);
 
-      if($draft->using_depth_charts == 1) {
+      if ($draft->using_depth_charts == 1) {
         $this->app['phpdraft.DepthChartPositionRepository']->DeleteAllDepthChartPositions($draft->draft_id);
         $depth_charts = $this->app['phpdraft.DepthChartPositionRepository']->Save($depthChartModel, $draft->draft_id);
       }
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -70,7 +70,7 @@ 
       $draft = $this->app['phpdraft.DraftRepository']->UpdateStatus($draft);
 
       //If we know we're moving from undrafted to in progress, perform the necessary setup steps:
-      if($draft->draft_status != $old_status && $draft->draft_status == "in_progress") {
+      if ($draft->draft_status != $old_status && $draft->draft_status == "in_progress") {
         //Delete all trades
         $this->app['phpdraft.TradeRepository']->DeleteAllTrades($draft->draft_id);
         //Delete all picks
@@ -85,7 +85,7 @@ 
 
       $response->success = true;
       $response->draft = $draft;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -111,7 +111,7 @@ 
       $this->app['phpdraft.DraftRepository']->DeleteDraft($draft->draft_id);
 
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -125,7 +125,7 @@ 
     try {
       $response->draft_statistics = $this->app['phpdraft.DraftStatsRepository']->LoadDraftStats($draft_id);
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $message = $e->getMessage();
       $response->success = false;
       $response->errors[] = $message;

api/Domain/Services/ManagerService.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Manager;
 use PhpDraft\Domain\Models\PhpDraftResponse;
 

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
       $response->success = true;
       $response->manager = $manager;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -37,7 +37,7 @@ 
 
       $response->success = true;
       $response->managers = $managers;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -52,7 +52,7 @@ 
       $this->app['phpdraft.ManagerRepository']->ReorderManagers($managersIdArray);
       
       $response->success = true;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -87,7 +87,7 @@ 
       $managers = $this->app['phpdraft.ManagerRepository']->GetManagersByDraftOrder($draft_id);
       $managersIdArray = array();
 
-      foreach($managers as $manager) {
+      foreach ($managers as $manager) {
         $managersIdArray[] = $manager->manager_id;
       }
 
@@ -97,7 +97,7 @@ 
 
       $response->managers = $managers;
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }

Braces +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
       $response->success = true;
       $response->manager = $manager;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -37,7 +37,7 @@ 
 
       $response->success = true;
       $response->managers = $managers;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -52,7 +52,7 @@ 
       $this->app['phpdraft.ManagerRepository']->ReorderManagers($managersIdArray);
       
       $response->success = true;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }

api/Domain/Services/PickService.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Entities\Pick;
 use PhpDraft\Domain\Models\PhpDraftResponse;

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
     try {
       $response->allPicks = $this->app['phpdraft.PickRepository']->LoadAll($draft);
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $message = $e->getMessage();
       $response->errors[] = "Unable to load picks: $message";
@@ -44,7 +44,7 @@ 
     try {
       $response->pick = $this->app['phpdraft.PickRepository']->GetCurrentPick($draft);
 
-      if($include_data) {
+      if ($include_data) {
         $response->teams = $this->app['phpdraft.DraftDataRepository']->GetTeams($draft->draft_sport);
         $response->historical_teams = $this->app['phpdraft.DraftDataRepository']->GetHistoricalTeams($draft->draft_sport);
         $response->positions = $this->app['phpdraft.DraftDataRepository']->GetPositions($draft->draft_sport);
@@ -53,7 +53,7 @@ 
       }
 
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       //Rather than unset all of the 1-5 properties from the try above, just grab a new Response object:
       $response = new PhpDraftResponse(false, array());
 
@@ -83,7 +83,7 @@ 
 
       $response->draft_is_complete = $this->app['phpdraft.DraftService']->DraftComplete($draft);
 
-      if($response->draft_is_complete == 1) {
+      if ($response->draft_is_complete == 1) {
         $response->draft_statistics = $this->app['phpdraft.DraftStatsRepository']->CalculateDraftStatistics($draft);
       }
 
@@ -93,7 +93,7 @@ 
       $response->next_5_picks = $this->app['phpdraft.PickRepository']->LoadNextPicks($draft->draft_id, $draft->draft_current_pick, 5);
 
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response = new PhpDraftResponse(false, array());
 
       $errorMessage = $e->getMessage();
@@ -117,7 +117,7 @@ 
 
       $response->pick = $pick;
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response = new PhpDraftResponse(false, array());
 
       $errorMessage = $e->getMessage();
@@ -137,7 +137,7 @@ 
 
       $response->pick = $pick;
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $errorMessage = $e->getMessage();
       $response->errors[] = "Unable to update pick depth chart: $errorMessage";
@@ -153,7 +153,7 @@ 
       $response->matches = $this->app['phpdraft.PickRepository']->SearchAlreadyDrafted($draft_id, $first_name, $last_name);
       $response->possibleMatchExists = count($response->matches) > 0;
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response = new PhpDraftResponse(false, array());
       $errorMessage = $e->getMessage();
       $response->errors[] = "Unable to check for already drafted: $errorMessage";
@@ -168,7 +168,7 @@ 
     try {
       $draft = $this->app['phpdraft.DraftRepository']->Load($draft_id);
 
-      if($pick_counter < $draft->draft_counter) {
+      if ($pick_counter < $draft->draft_counter) {
         $response->updated_picks = $this->app['phpdraft.PickRepository']->LoadUpdatedPicks($draft_id, $pick_counter);
         $response->current_pick = $this->app['phpdraft.PickRepository']->GetCurrentPick($draft);
         $response->previous_pick = $this->app['phpdraft.PickRepository']->GetPreviousPick($draft);
@@ -181,7 +181,7 @@ 
 
       $response->draft_counter = $draft->draft_counter;
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $errorMessage = $e->getMessage();
       $response->errors[] = "Unable to get updated picks: $errorMessage";

Braces +5 added lines, -4 removed lines

@@ -200,10 +200,11 @@
     $pick->pick_time = $now_utc->format('Y-m-d H:i:s');
 
     //Calculate the pick duration
-    if ($pick->player_pick == 1 || $previous_pick == null)
-      $start_time = new \DateTime($draft->draft_start_time, new \DateTimeZone("UTC"));
-    else
-      $start_time = new \DateTime($previous_pick->pick_time, new \DateTimeZone("UTC"));
+    if ($pick->player_pick == 1 || $previous_pick == null) {
+          $start_time = new \DateTime($draft->draft_start_time, new \DateTimeZone("UTC"));
+    } else {
+          $start_time = new \DateTime($previous_pick->pick_time, new \DateTimeZone("UTC"));
+    }
 
     $start_time_timestamp = $start_time->getTimestamp();
 

api/Domain/Services/ProPlayerService.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Entities\ProPlayer;
 use PhpDraft\Domain\Models\PhpDraftResponse;
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
       #If there's a space and no matches so far, create another searches where we manually split them firstname/lastname by sace automatically
       $split_name_automatically = count($players) == 0 && strpos($searchTerm, " ") != false;
 
-      if($split_name_automatically) {
+      if ($split_name_automatically) {
         $names = explode(" ", $searchTerm, 2);
         $players = $this->app['phpdraft.ProPlayerRepository']->SearchPlayersByAssumedName($league, $names[0], $names[1]);
       }

Braces +6 added lines, -4 removed lines

@@ -67,12 +67,14 @@
       return $response;
     }
 
-    if (SET_CSV_TIMEOUT)
-      set_time_limit(0);
+    if (SET_CSV_TIMEOUT) {
+          set_time_limit(0);
+    }
 
     while (($data = fgetcsv($handle, 1000, ';')) !== FALSE) {
-      if ($data[0] == "Player")
-        continue;
+      if ($data[0] == "Player") {
+              continue;
+      }
 
       $new_player = new ProPlayer();
 

api/Domain/Services/RoundTimeService.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
-use PhpDraft\Domain\Entities\RoundTime;
 use PhpDraft\Domain\Models\PhpDraftResponse;
 use PhpDraft\Domain\Models\RoundTimeCreateModel;
 

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 
       $response->success = true;
       $response->roundTimes = $roundTimes;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -39,7 +39,7 @@ 
       $current_pick = $this->app['phpdraft.PickRepository']->GetCurrentPick($draft);
       $last_pick = $this->app['phpdraft.PickRepository']->GetPreviousPick($draft);
       $current_round_picktime = $this->app['phpdraft.RoundTimeRepository']->LoadByRound($draft);
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }
@@ -47,7 +47,7 @@ 
     $response->success = true;
     $response->timer_enabled = $current_round_picktime != null;
 
-    if(!$response->timer_enabled) {
+    if (!$response->timer_enabled) {
       return $response;
     }
 

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
       $response->success = true;
       $response->roundTimes = $roundTimes;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $response->success = false;
       $response->errors = array($e->getMessage());
     }