mattheworres / phpdraft

api/Domain/Services/EmailService.php

Spacing +4 added lines, -4 removed lines

@@ -23,12 +23,12 @@ 
     $this->mailer->Host = MAIL_SERVER;
     $this->mailer->Port = MAIL_PORT;
 
-    if(MAIL_DEVELOPMENT != true) {
+    if (MAIL_DEVELOPMENT != true) {
       $this->mailer->SMTPAuth = true;
       $this->mailer->Username = MAIL_USER;
       $this->mailer->Password = MAIL_PASS;
 
-      if(MAIL_USE_ENCRYPTION == true) {
+      if (MAIL_USE_ENCRYPTION == true) {
         $this->mailer->SMTPSecure = MAIL_ENCRYPTION;
       }
     }
@@ -38,7 +38,7 @@ 
   }
 
   public function SendMail(MailMessage $message) {
-    foreach($message->to_addresses as $address => $name) {
+    foreach ($message->to_addresses as $address => $name) {
       $this->mailer->addAddress($address, $name);
     }
 
@@ -48,7 +48,7 @@ 
 
     $this->mailer->Body = $message->body;
 
-    if(!$this->mailer->send()) {
+    if (!$this->mailer->send()) {
       throw new \Exception("Unable to send mail: " . $this->mailer->ErrorInfo);
     }
 

api/Domain/Services/LoginUserService.php

Spacing +22 added lines, -22 removed lines

@@ -19,7 +19,7 @@ 
   public function GetCurrentUser() {
     $token = $this->app['security.token_storage']->getToken();
 
-    if($token == null) {
+    if ($token == null) {
       //In public actions, this isn't an exception - we're just not logged in.
       return null;
       //throw new \Exception("Username not found.");
@@ -32,9 +32,9 @@ 
 
   //This is a hack to make accessing logged in user info from anonymous routes possible:
   public function GetUserFromHeaderToken(Request $request) {
-    $request_token = $request->headers->get(AUTH_KEY_HEADER,'');
+    $request_token = $request->headers->get(AUTH_KEY_HEADER, '');
 
-    if(empty($request_token)) {
+    if (empty($request_token)) {
       return null;
     }
 
@@ -44,7 +44,7 @@ 
       $email = $decoded->name;
 
       return $this->app['phpdraft.LoginUserRepository']->Load($email);
-    }catch(\Exception $ex) {
+    } catch (\Exception $ex) {
       return null;
     }
   }
@@ -55,7 +55,7 @@ 
     try {
       $response->commissioners = $this->app['phpdraft.LoginUserRepository']->SearchCommissioners($searchTerm);
       $response->success = true;
-    } catch(\Exception $ex) {
+    } catch (\Exception $ex) {
       $message = $ex->getMessage();
       $response->success = false;
       $response->errors[] = $message;
@@ -70,7 +70,7 @@ 
     try {
       $response->commissioner = $this->app['phpdraft.LoginUserRepository']->LoadPublicById($commish_id);
       $response->success = true;
-    } catch(\Exception $ex) {
+    } catch (\Exception $ex) {
       $message = $ex->getMessage();
       $response->success = false;
       $response->errors[] = $message;
@@ -86,7 +86,7 @@ 
       $response->users = $this->app['phpdraft.LoginUserRepository']->LoadAll();
       $response->roles = $this->app['phpdraft.LoginUserRepository']->GetRoles();
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $message = $e->getMessage();
       $response->success = false;
       $response->errors[] = $message;
@@ -109,7 +109,7 @@ 
 
       $message = new MailMessage();
 
-      $message->to_addresses = array (
+      $message->to_addresses = array(
         $user->email => $user->name
       );
 
@@ -128,7 +128,7 @@ 
       $this->app['phpdraft.EmailService']->SendMail($message);
 
       $response->success = true;
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       //$this->app['db']->rollback();
 
       $response->success = false;
@@ -151,7 +151,7 @@ 
     $user->verificationKey = $this->app['phpdraft.SaltService']->GenerateSalt();
 
     //Found out that forward slashes are no good for URLs. Go figure.
-    while(strpos($user->verificationKey, '/') != 0) {
+    while (strpos($user->verificationKey, '/') != 0) {
       $user->verificationKey = $this->app['phpdraft.SaltService']->GenerateSalt();
     }
 
@@ -164,7 +164,7 @@ 
 
       $message = new MailMessage();
 
-      $message->to_addresses = array (
+      $message->to_addresses = array(
         $user->email => $user->name
       );
 
@@ -187,7 +187,7 @@ 
       $response->success = true;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;
@@ -212,7 +212,7 @@ 
       $response->success = true;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;
@@ -234,7 +234,7 @@ 
     $user->name = $name;
 
     //Update user email, invalidate login
-    if(!empty($email) && !StringUtils::equals($email, $user->email)) {
+    if (!empty($email) && !StringUtils::equals($email, $user->email)) {
       $user->email = $email;
       $user->enabled = false;
       $invalidateLogin = true;
@@ -242,7 +242,7 @@ 
       $sendEmail = true;
     }
 
-    if(!empty($newPassword)) {
+    if (!empty($newPassword)) {
       $invalidateLogin = true;
       $user->salt = $this->app['phpdraft.SaltService']->GenerateSalt();
       $user->password = $this->app['security.encoder.digest']->encodePassword($newPassword, $user->salt);
@@ -250,15 +250,15 @@ 
 
     $response = new PhpDraftResponse();
 
-    try{
+    try {
       $this->app['db']->beginTransaction();
 
       $user = $this->app['phpdraft.LoginUserRepository']->Update($user);
 
-      if($sendEmail) {
+      if ($sendEmail) {
         $message = new MailMessage();
 
-        $message->to_addresses = array (
+        $message->to_addresses = array(
           $user->email => $user->name
         );
 
@@ -282,7 +282,7 @@ 
       $response->sendEmail = $sendEmail;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch (\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;
@@ -298,16 +298,16 @@ 
     try {
       //Find all drafts this user owns
       $drafts = $this->app['phpdraft.DraftRepository']->GetAllDraftsByCommish($user->id);
-      foreach($drafts as $draft) {
+      foreach ($drafts as $draft) {
         $response = $this->app['phpdraft.DraftService']->DeleteDraft($draft);
-        if(!$response->success) {
+        if (!$response->success) {
           throw new \Exception("Unable to recursively delete draft or one of its children.");
         }
       }
       $this->app['phpdraft.LoginUserRepository']->Delete($user);
 
       $response->success = true;
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $message = $e->getMessage();
       $response->success = false;
       $response->errors[] = $message;

Braces +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
       $email = $decoded->name;
 
       return $this->app['phpdraft.LoginUserRepository']->Load($email);
-    }catch(\Exception $ex) {
+    } catch(\Exception $ex) {
       return null;
     }
   }
@@ -128,7 +128,7 @@ 
       $this->app['phpdraft.EmailService']->SendMail($message);
 
       $response->success = true;
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       //$this->app['db']->rollback();
 
       $response->success = false;
@@ -187,7 +187,7 @@ 
       $response->success = true;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;
@@ -212,7 +212,7 @@ 
       $response->success = true;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;
@@ -282,7 +282,7 @@ 
       $response->sendEmail = $sendEmail;
 
       $this->app['db']->commit();
-    }catch(\Exception $e) {
+    } catch(\Exception $e) {
       $this->app['db']->rollback();
 
       $response->success = false;

api/Domain/Models/PhpDraftResponse.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
   public $success;
   public $errors;
 
-  public function responseType($successResponse = Response::HTTP_OK){
+  public function responseType($successResponse = Response::HTTP_OK) {
     return $this->success
       ? $successResponse
       : Response::HTTP_BAD_REQUEST;

api/Domain/Repositories/RoundTimeRepository.php

Spacing +11 added lines, -11 removed lines

@@ -27,23 +27,23 @@ 
     $timerStmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\RoundTime');
     $timerStmt->bindParam(1, $draftId);
 
-    if(!$timerStmt->execute()) {
+    if (!$timerStmt->execute()) {
       throw new \Exception("Unable to load round times.");
     }
 
     $timers = array();
 
-    while($timer = $timerStmt->fetch()) {
+    while ($timer = $timerStmt->fetch()) {
       $timers[] = $timer;
     }
 
     $isStaticTime = false;
 
-    if(count($timers) == 1 && $timers[0]->is_static_time) {
+    if (count($timers) == 1 && $timers[0]->is_static_time) {
       $isStaticTime = true;
     }
 
-    if(empty($timers) || count($timers) != $draft->draft_rounds) {
+    if (empty($timers) || count($timers) != $draft->draft_rounds) {
       $timers = $this->_CoalesceDraftTimers($draft, $timers, $isStaticTime);
     }
 
@@ -53,15 +53,15 @@ 
   private function _CoalesceDraftTimers(Draft $draft, $existing_timers, $isStaticTime) {
     $coalescedTimers = array();
 
-    for($i = 0; $i < $draft->draft_rounds; $i++) {
-      if($isStaticTime && $i == 0) {
+    for ($i = 0; $i < $draft->draft_rounds; $i++) {
+      if ($isStaticTime && $i == 0) {
         $timer = $existing_timers[$i];
         $timer->draft_round = $i + 1;
         $coalescedTimers[] = $timer;
         continue;
       }
 
-      if(array_key_exists($i, $existing_timers)) {
+      if (array_key_exists($i, $existing_timers)) {
         $coalescedTimers[] = $existing_timers[$i];
       } else {
         $newTimer = new RoundTime();
@@ -105,7 +105,7 @@ 
     $deleteRoundTime = $this->app['db']->prepare("DELETE FROM round_times WHERE draft_id = ?");
     $deleteRoundTime->bindParam(1, $draftId);
 
-    if(!$deleteRoundTime->execute()) {
+    if (!$deleteRoundTime->execute()) {
       throw new \Exception("Unable to delete round times: " . $this->app['db']->errorInfo());
     }
 
@@ -119,11 +119,11 @@ 
     $staticRoundTimeStmt->setFetchMode(\PDO::FETCH_INTO, $roundTime);
     $staticRoundTimeStmt->bindParam(1, $draft->draft_id);
 
-    if(!$staticRoundTimeStmt->execute()) {
+    if (!$staticRoundTimeStmt->execute()) {
       throw new \Exception("Unable to get static round time.");
     }
 
-    if($staticRoundTimeStmt->rowCount() == 1) {
+    if ($staticRoundTimeStmt->rowCount() == 1) {
       $staticRoundTimeStmt->fetch();
 
       return $roundTime;
@@ -138,7 +138,7 @@ 
       throw new \Exception("Unable to load round time:" . $this->app['db']->errorInfo());
     }
 
-    if($roundTimeStmt->rowCount() == 0) {
+    if ($roundTimeStmt->rowCount() == 0) {
       return null;
     }
 

api/Domain/Repositories/TradeRepository.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $trade->manager1 = $this->app['phpdraft.ManagerRepository']->Load($trade->manager1_id);
         $trade->manager2 = $this->app['phpdraft.ManagerRepository']->Load($trade->manager2_id);
         $trade->trade_assets = $this->GetAssets($trade, $trade->manager1, $trade->manager2);
-      }catch(\Exception $e) {
+      } catch (\Exception $e) {
         throw new \Exception("Unable to load managers or trade assets: " . $e->getMessage());
       }
 
@@ -83,7 +83,7 @@ 
     $draft_trade_stmt->bindParam(1, $draft_id);
     $draft_trade_stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Trade');
 
-    if(!$draft_trade_stmt->execute()) {
+    if (!$draft_trade_stmt->execute()) {
       throw new \Exception("Unable to delete trades for draft $draft_id");
     }
 
@@ -134,13 +134,13 @@ 
 
     $stmt->bindParam(':trade_id', $trade->trade_id);
 
-    foreach($trade->trade_assets as &$asset) {
+    foreach ($trade->trade_assets as &$asset) {
       $stmt->bindParam(':player_id', $asset->player->player_id);
       $stmt->bindParam(':oldmanager_id', $asset->oldmanager->manager_id);
       $stmt->bindParam(':newmanager_id', $asset->newmanager->manager_id);
       $stmt->bindParam(':was_drafted', $asset->was_drafted);
 
-      if(!$stmt->execute()) {
+      if (!$stmt->execute()) {
         throw new Exception("Unable to save trade asset #$asset->player_id");
       }
 

Braces +19 added lines, -13 removed lines

@@ -31,7 +31,7 @@ 
         $trade->manager1 = $this->app['phpdraft.ManagerRepository']->Load($trade->manager1_id);
         $trade->manager2 = $this->app['phpdraft.ManagerRepository']->Load($trade->manager2_id);
         $trade->trade_assets = $this->GetAssets($trade, $trade->manager1, $trade->manager2);
-      }catch(\Exception $e) {
+      } catch(\Exception $e) {
         throw new \Exception("Unable to load managers or trade assets: " . $e->getMessage());
       }
 
@@ -58,19 +58,22 @@ 
     while ($asset = $stmt->fetch()) {
       /* @var $asset trade_asset_object */
       //We must use the protected $newmanager_id and $oldmanager_id because we have just pulled from DB, objs aren't automatic:
-      if ($asset->newmanager_id != $manager1->manager_id && $asset->newmanager_id != $manager2->manager_id)
-        throw new \Exception('Invalid manager ID for asset: ' . $asset->newmanager_id);
+      if ($asset->newmanager_id != $manager1->manager_id && $asset->newmanager_id != $manager2->manager_id) {
+              throw new \Exception('Invalid manager ID for asset: ' . $asset->newmanager_id);
+      }
 
-      if ($asset->oldmanager_id != $manager1->manager_id && $asset->oldmanager_id != $manager2->manager_id)
-        throw new \Exception('Invalid manager ID for asset: ' . $asset->oldmanager_id);
+      if ($asset->oldmanager_id != $manager1->manager_id && $asset->oldmanager_id != $manager2->manager_id) {
+              throw new \Exception('Invalid manager ID for asset: ' . $asset->oldmanager_id);
+      }
 
       //Use passed in manager_objects to prevent unneccessary SELECTs to the db:
       $asset->player = $this->app['phpdraft.PickRepository']->Load($asset->player_id);
       $asset->newmanager = $asset->newmanager_id == $manager1->manager_id ? $manager1 : $manager2;
       $asset->oldmanager = $asset->oldmanager_id == $manager1->manager_id ? $manager1 : $manager2;
 
-      if ($asset->player == false || $asset->newmanager == false || $asset->oldmanager == false)
-        throw new \Exception('Invalid asset loaded.');
+      if ($asset->player == false || $asset->newmanager == false || $asset->oldmanager == false) {
+              throw new \Exception('Invalid asset loaded.');
+      }
 
       $assets[] = $asset;
     }
@@ -89,8 +92,9 @@ 
 
     $trades = array();
 
-    while ($trade = $draft_trade_stmt->fetch())
-      $trades[] = $trade;
+    while ($trade = $draft_trade_stmt->fetch()) {
+          $trades[] = $trade;
+    }
 
     $delete_assets_stmt = $this->app['db']->prepare("DELETE FROM trade_assets WHERE trade_id = :trade_id");
     $delete_trade_stmt = $this->app['db']->prepare("DELETE FROM trades WHERE trade_id = :trade_id");
@@ -98,13 +102,15 @@ 
     foreach ($trades as $trade) {
       $delete_assets_stmt->bindValue(":trade_id", $trade->trade_id);
 
-      if (!$delete_assets_stmt->execute())
-        throw new \Exception("Unable to delete trade assets for $draft_id.");
+      if (!$delete_assets_stmt->execute()) {
+              throw new \Exception("Unable to delete trade assets for $draft_id.");
+      }
 
       $delete_trade_stmt->bindValue(":trade_id", $trade->trade_id);
 
-      if (!$delete_trade_stmt->execute())
-        throw new \Exception("Unable to delete trade assets for $draft_id.");
+      if (!$delete_trade_stmt->execute()) {
+              throw new \Exception("Unable to delete trade assets for $draft_id.");
+      }
     }
 
     return;

api/Domain/Repositories/LoginUserRepository.php

Spacing +12 added lines, -12 removed lines

@@ -80,11 +80,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);
     }
@@ -109,7 +109,7 @@ 
       throw new \Exception("Unable to create user.");
     }
 
-    $user->id = (int) $this->app['db']->lastInsertId();
+    $user->id = (int)$this->app['db']->lastInsertId();
 
     return $user;
   }
@@ -147,7 +147,7 @@ 
 
     $result = $update_stmt->execute();
 
-    if($result == false) {
+    if ($result == false) {
       throw new \Exception("Unable to erase verification key for user.");
     }
 
@@ -158,7 +158,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");
     }
 
@@ -166,7 +166,7 @@ 
   }
 
   public function NameIsUnique($name, $id = null) {
-    if($id == null) {
+    if ($id == null) {
       $name_stmt = $this->app['db']->prepare("SELECT name FROM users WHERE name LIKE ?");
       $name_stmt->bindParam(1, strtolower($name));
     } else {
@@ -175,7 +175,7 @@ 
       $name_stmt->bindParam(2, $id);
     }
 
-    if(!$name_stmt->execute()) {
+    if (!$name_stmt->execute()) {
       throw new \Exception(sprintf('Name %s is invalid', $name));
     }
 
@@ -183,7 +183,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 {
@@ -203,7 +203,7 @@ 
     $email_stmt = $this->app['db']->prepare("SELECT email FROM users WHERE email = ? LIMIT 1");
     $email_stmt->bindParam(1, strtolower($email));
 
-    if(!$email_stmt->execute()) {
+    if (!$email_stmt->execute()) {
       throw new \Exception(sprintf('Email %s is invalid', $email));
     }
 
@@ -219,11 +219,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);
@@ -242,7 +242,7 @@ 
     $verification_stmt->bindParam(1, strtolower($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

@@ -20,11 +20,13 @@ 
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $load_stmt->bindParam(1, strtolower($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;
   }
@@ -38,11 +40,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;
   }
@@ -56,11 +60,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);

api/Domain/Repositories/DraftStatsRepository.php

Spacing +26 added lines, -26 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,12 +118,12 @@ 
     $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.");
     }
   }
 
-  private function _LoadDraftSpecificStats(Draft $draft, DraftStats &$stats) {
+  private function _LoadDraftSpecificStats(Draft $draft, DraftStats & $stats) {
     $start_time = new \DateTime($draft->draft_start_time, new \DateTimeZone("UTC"));
     $end_time = new \DateTime($draft->draft_end_time, new \DateTimeZone("UTC"));
 
@@ -133,7 +133,7 @@ 
     $stats->drafting_time_seconds = (int)($end_seconds - $start_seconds);
   }
 
-  private function _LoadLongestAveragePick($draft_id, DraftStats &$stats) {
+  private function _LoadLongestAveragePick($draft_id, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT p.pick_duration, m.manager_name, avg(pick_duration) as pick_average
     FROM players p
     LEFT OUTER JOIN managers m
@@ -153,7 +153,7 @@ 
     $stats->longest_avg_pick_seconds = (int)$row['pick_average'];
   }
 
-  private function _LoadShortestAveragePick($draft_id, DraftStats &$stats) {
+  private function _LoadShortestAveragePick($draft_id, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT p.pick_duration, m.manager_name, avg(pick_duration) as pick_average
     FROM players p
     LEFT OUTER JOIN managers m
@@ -170,10 +170,10 @@ 
     $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) {
+  private function _LoadSlowestPick($draft_id, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT p.pick_duration, p.player_pick, m.manager_name, max(pick_duration) as pick_max
     FROM players p
     LEFT OUTER JOIN managers m
@@ -190,10 +190,10 @@ 
     $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) {
+  private function _LoadFastestPick($draft_id, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT p.pick_duration, p.player_pick, m.manager_name, min(pick_duration) as pick_min
     FROM players p
     LEFT OUTER JOIN managers m
@@ -210,10 +210,10 @@ 
     $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) {
+  private function _LoadAveragePickTime($draft_id, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT avg(pick_duration) as pick_average
     FROM players p
     WHERE p.draft_id = ?
@@ -225,10 +225,10 @@ 
 
     $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) {
+  private function _LoadRoundTimes(Draft $draft, DraftStats & $stats) {
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.player_round, sum( p.pick_duration ) AS round_time
     FROM players p
     WHERE p.draft_id = ?
@@ -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,10 +279,10 @@ 
 
     $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) {
+  private function _LoadTeamSuperlatives($draft_id, DraftStats & $stats, $teams) {
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.team, count(team) as team_occurences
     FROM players p
     WHERE p.draft_id = ?
@@ -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,10 +315,10 @@ 
     $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) {
+  private function _LoadPositionSuperlatives($draft_id, DraftStats & $stats, $positions) {
     $stmt = $this->app['db']->prepare("SELECT DISTINCT p.position, count(position) as position_occurences
     FROM players p
     WHERE p.draft_id = ?
@@ -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'];
   }
 }
\ No newline at end of file

api/Domain/Repositories/DepthChartPositionRepository.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
   public function LoadAll($draft_id) {
     $positions = array();
     
-    $stmt = $this->app['db']->prepare("SELECT d.* ".
+    $stmt = $this->app['db']->prepare("SELECT d.* " .
             "FROM depth_chart_positions d " .
             "WHERE d.draft_id = ? " .
             "ORDER BY d.display_order");
@@ -26,11 +26,11 @@ 
     
     $stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\DepthChartPosition');
     
-    if(!$stmt->execute()) {
+    if (!$stmt->execute()) {
       throw new \Exception("Unable to load updated positions.");
     }
     
-    while($position = $stmt->fetch()) {
+    while ($position = $stmt->fetch()) {
       $positions[] = $position;
     }
     
@@ -66,7 +66,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM depth_chart_positions WHERE draft_id = ?");
     $delete_stmt->bindParam(1, $draft_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete existing depth chart positions.");
     }
   }

api/Domain/Repositories/ManagerRepository.php

Spacing +17 added lines, -17 removed lines

@@ -35,11 +35,11 @@ 
 
     $managers_stmt->bindParam(1, $draft_id);
 
-    if(!$managers_stmt->execute()) {
+    if (!$managers_stmt->execute()) {
       throw new \Exception("Unable to load managers for draft #$draft_id");
     }
 
-    while($manager = $managers_stmt->fetch()) {
+    while ($manager = $managers_stmt->fetch()) {
       $managers[] = $manager;
     }
 
@@ -49,7 +49,7 @@ 
   public function GetManagersByDraftOrder($draft_id, $descending = false) {
     $managers = array();
 
-    if($descending) {
+    if ($descending) {
       $managers_stmt = $this->app['db']->prepare("SELECT * FROM managers WHERE draft_id = ? ORDER BY draft_order DESC");
     } else {
       $managers_stmt = $this->app['db']->prepare("SELECT * FROM managers WHERE draft_id = ? ORDER BY draft_order");  
@@ -59,11 +59,11 @@ 
 
     $managers_stmt->setFetchMode(\PDO::FETCH_CLASS, '\PhpDraft\Domain\Entities\Manager');
 
-    if(!$managers_stmt->execute()) {
+    if (!$managers_stmt->execute()) {
       throw new \Exception("Unable to load managers for draft #$draft_id");
     }
 
-    while($manager = $managers_stmt->fetch()) {
+    while ($manager = $managers_stmt->fetch()) {
       $managers[] = $manager;
     }
 
@@ -75,7 +75,7 @@ 
     $manager_stmt = $this->app['db']->prepare("SELECT manager_name FROM managers WHERE draft_id = ?");
     $manager_stmt->bindParam(1, $draft_id);
 
-    if(!$manager_stmt->execute()) {
+    if (!$manager_stmt->execute()) {
       throw new \Exception("Draft id '%s' is invalid", $draft_id);
     }
 
@@ -86,7 +86,7 @@ 
     $manager_stmt = $this->app['db']->prepare("SELECT COUNT(manager_id) FROM managers WHERE draft_id = ?");
     $manager_stmt->bindParam(1, $draft_id);
 
-    if(!$manager_stmt->execute()) {
+    if (!$manager_stmt->execute()) {
       throw new \Exception("Unable to get number of managers for draft #$draft_id");
     }
 
@@ -94,7 +94,7 @@ 
   }
 
   public function NameIsUnique($name, $draft_id, $id = null) {
-    if(!empty($id)) {
+    if (!empty($id)) {
       $name_stmt = $this->app['db']->prepare("SELECT manager_name FROM managers WHERE manager_name LIKE ? AND draft_id = ? AND manager_id <> ?");
       $name_stmt->bindParam(1, $name);
       $name_stmt->bindParam(2, $draft_id);
@@ -105,7 +105,7 @@ 
       $name_stmt->bindParam(2, $draft_id);
     }
 
-    if(!$name_stmt->execute()) {
+    if (!$name_stmt->execute()) {
       throw new \Exception("Manager name '$name' is invalid");
     }
 
@@ -117,7 +117,7 @@ 
     $exists_stmt->bindParam(1, $id);
     $exists_stmt->bindParam(2, $draft_id);
 
-    if(!$exists_stmt->execute()) {
+    if (!$exists_stmt->execute()) {
       throw new \Exception("Manager ID $id is invalid");
     }
 
@@ -136,7 +136,7 @@ 
       throw new \Exception("Unable to create new manager: " . $this->app['db']->errorInfo());
     }
 
-    $manager->manager_id = (int) $this->app['db']->lastInsertId();
+    $manager->manager_id = (int)$this->app['db']->lastInsertId();
 
     return $manager;
   }
@@ -148,7 +148,7 @@ 
     $newDraftOrder = $this->_GetLowestDraftorder($draft_id) + 1;
     $newManagers = array();
 
-    foreach($managersArray as $newManager) {
+    foreach ($managersArray as $newManager) {
       $save_stmt->bindValue(':draft_id', $newManager->draft_id);
       $save_stmt->bindValue(':manager_name', $newManager->manager_name);
       $save_stmt->bindValue(':draft_order', $newDraftOrder++);
@@ -169,7 +169,7 @@ 
     $update_stmt->bindParam(1, $manager->manager_name);
     $update_stmt->bindParam(2, $manager->manager_id);
 
-    if(!$update_stmt->execute()) {
+    if (!$update_stmt->execute()) {
       throw new \Exception("Unable to update manager #$manager->manager_id");
     }
 
@@ -181,11 +181,11 @@ 
 
     $newDraftOrder = 1;
 
-    foreach($managersIdArray as $manager_id) {
+    foreach ($managersIdArray as $manager_id) {
       $reorder_stmt->bindValue(':draft_order', $newDraftOrder++);
       $reorder_stmt->bindValue(':manager_id', $manager_id);
 
-      if(!$reorder_stmt->execute()) {
+      if (!$reorder_stmt->execute()) {
         throw new \Exception("Unable to update manager order for manager #$manager_id");
       }
     }
@@ -197,7 +197,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM managers WHERE manager_id = ?");
     $delete_stmt->bindParam(1, $manager_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete manager $manager_id.");
     }
 
@@ -208,7 +208,7 @@ 
     $delete_stmt = $this->app['db']->prepare("DELETE FROM managers WHERE draft_id = ?");
     $delete_stmt->bindParam(1, $draft_id);
 
-    if(!$delete_stmt->execute()) {
+    if (!$delete_stmt->execute()) {
       throw new \Exception("Unable to delete managers for draft $draft_id.");
     }
 

Braces +6 added lines, -4 removed lines

@@ -18,11 +18,13 @@
     $load_stmt->setFetchMode(\PDO::FETCH_INTO, $manager);
     $load_stmt->bindParam(1, $id);
 
-    if (!$load_stmt->execute())
-      throw new \Exception(sprintf('Manager "%s" does not exist.', $manager));
+    if (!$load_stmt->execute()) {
+          throw new \Exception(sprintf('Manager "%s" does not exist.', $manager));
+    }
 
-    if (!$load_stmt->fetch())
-      throw new \Exception(sprintf('Manager "%s" does not exist.', $id));
+    if (!$load_stmt->fetch()) {
+          throw new \Exception(sprintf('Manager "%s" does not exist.', $id));
+    }
 
     return $manager;
   }