mattheworres / phpdraft

api/Domain/Validators/LoginUserValidator.php

Spacing +30 added lines, -30 removed lines

@@ -24,7 +24,7 @@ 
     $name = $request->get('_name');
     $recaptcha = $request->get('_recaptcha');
 
-    if(empty($password)
+    if (empty($password)
       || empty($confirmPassword)
       || empty($emailAddress)
       || empty($name)
@@ -41,7 +41,7 @@ 
 
     $this->validateEmailAddress($emailAddress, $errors, $valid);
 
-    if(!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($name)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($name)) {
       $errors[] = "Name already taken.";
       $valid = false;
     }
@@ -58,14 +58,14 @@ 
     $emailAddress = $request->get('_email');
     $verificationToken = $this->app['phpdraft.SaltService']->UrlDecodeSalt($request->get('_verificationToken'));
 
-    if(strlen($verificationToken) != 16) {
+    if (strlen($verificationToken) != 16) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
 
     $this->validateEmailAddress($emailAddress, $errors, $valid);
 
-    if(!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
@@ -99,18 +99,18 @@ 
     $valid = true;
     $errors = array();
 
-    if(empty($emailAddress)
+    if (empty($emailAddress)
       || empty($verificationToken)) {
       $errors[] = "One or more missing fields";
       $valid = false;
     }
 
-    if(strlen($verificationToken) != 16) {
+    if (strlen($verificationToken) != 16) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
@@ -131,7 +131,7 @@ 
     $confirmPassword = $request->get('_confirmPassword');
     $verificationToken = $this->app['phpdraft.SaltService']->UrlDecodeSalt($request->get('_verificationToken'));
 
-    if(empty($emailAddress)
+    if (empty($emailAddress)
       || empty($password)
       || empty($confirmPassword)
       || empty($verificationToken)) {
@@ -139,12 +139,12 @@ 
       $valid = false;
     }
 
-    if(strlen($verificationToken) != 16) {
+    if (strlen($verificationToken) != 16) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->VerificationMatches($emailAddress, $verificationToken)) {
       $errors[] = "Verification token invalid.";
       $valid = false;
     }
@@ -172,7 +172,7 @@ 
 
     $currentUser = $this->app['phpdraft.LoginUserService']->GetCurrentUser();
 
-    if(empty($currentUser) || $currentUser == null) {
+    if (empty($currentUser) || $currentUser == null) {
       $valid = false;
       $errors[] = "Invalid user.";
 
@@ -181,38 +181,38 @@ 
     }
 
     //Password required to make any changes
-    if(empty($password) || !$this->app['security.encoder.digest']->isPasswordValid($currentUser->password, $password, $currentUser->salt)) {
+    if (empty($password) || !$this->app['security.encoder.digest']->isPasswordValid($currentUser->password, $password, $currentUser->salt)) {
       $errors[] = "Incorrect password entered.";
       $valid = false;
     }
 
     //Need to verify new email
-    if(empty($emailAddress)) {
+    if (empty($emailAddress)) {
       $errors[] = "Email address is missing.";
       $valid = false;
-    } else if(!$this->app['phpdraft.StringsEqual']($emailAddress, $currentUser->email)) {
+    } else if (!$this->app['phpdraft.StringsEqual']($emailAddress, $currentUser->email)) {
       $this->validateEmailAddress($emailAddress, $errors, $valid);
 
       $this->validateUniqueEmail($emailAddress, $errors, $valid);
     }
 
     //Need to verify new password, ensure old password is correct
-    if(!empty($newPassword)) {
+    if (!empty($newPassword)) {
       $this->validatePasswordLength($newPassword, $errors, $valid);
 
       $this->validatePasswordsMatch($newPassword, $newConfirmedPassword, $errors, $valid);
     }
 
     //If the name has changed, ensure the new one is valid and unique
-    if($currentUser->name != $name) {
-      if(empty($name)) {
+    if ($currentUser->name != $name) {
+      if (empty($name)) {
         $errors[] = "Name is required.";
         $valid = false;
       }
 
       $this->validateNameLength($name, $errors, $valid);
 
-      if(!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($name)) {
+      if (!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($name)) {
         $errors[] = "Name already taken.";
         $valid = false;
       }
@@ -227,7 +227,7 @@ 
 
     $loadedUser = $this->app['phpdraft.LoginUserRepository']->LoadById($user->id);
 
-    if($user->id == 0 || empty($loadedUser)) {
+    if ($user->id == 0 || empty($loadedUser)) {
       $valid = false;
       $errors[] = "Invalid user.";
 
@@ -236,21 +236,21 @@ 
     }
 
     //Need to verify new email
-    if(empty($user->email)) {
+    if (empty($user->email)) {
       $errors[] = "Email address is missing.";
       $valid = false;
-    } else if(!$this->app['phpdraft.StringsEqual']($user->email, $loadedUser->email)) {
+    } else if (!$this->app['phpdraft.StringsEqual']($user->email, $loadedUser->email)) {
       $this->validateEmailAddress($user->email, $errors, $valid);
 
       $this->validateUniqueEmail($user->email, $errors, $valid);
     }
 
-    if(strlen($user->name) > 100) {
+    if (strlen($user->name) > 100) {
       $errors[] = "Name is above maximum length";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($user->name, $user->id)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->NameIsUnique($user->name, $user->id)) {
       $errors[] = "Name already taken.";
       $valid = false;
     }
@@ -259,47 +259,47 @@ 
   }
 
   private function validatePasswordsMatch($password1, $password2, &$errors, &$valid) {
-    if(!$this->app['phpdraft.StringsEqual']($password1, $password2)) {
+    if (!$this->app['phpdraft.StringsEqual']($password1, $password2)) {
       $errors[] = "Password values do not match.";
       $valid = false;
     }
   }
 
   private function validateUniqueEmail($emailAddress, &$errors, &$valid) {
-    if(!$this->app['phpdraft.LoginUserRepository']->EmailIsUnique($emailAddress)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->EmailIsUnique($emailAddress)) {
       $errors[] = "Email already registered.";
       $valid = false;
     }
   }
 
   private function validateEmailExists($emailAddress, &$errors, &$valid) {
-    if(!$this->app['phpdraft.LoginUserRepository']->EmailExists($emailAddress)) {
+    if (!$this->app['phpdraft.LoginUserRepository']->EmailExists($emailAddress)) {
       $errors[] = "Email invalid.";
       $valid = false;
     }
   }
 
   private function validateEmailAddress($emailAddress, &$errors, &$valid) {
-    if(!$this->app['phpdraft.EmailValidator']->isValid($emailAddress) || strlen($emailAddress) > 255) {
+    if (!$this->app['phpdraft.EmailValidator']->isValid($emailAddress) || strlen($emailAddress) > 255) {
       $errors[] = "Email invalid.";
       $valid = false;
     }
   }
 
   private function validatePasswordLength($password, &$errors, &$valid) {
-    if(strlen($password) < 8) {
+    if (strlen($password) < 8) {
       $errors[] = "Password is below minimum length.";
       $valid = false;
     }
 
-    if(strlen($password) > 255) {
+    if (strlen($password) > 255) {
       $errors[] = "Password is above maximum length.";
       $valid = false;
     }
   }
 
   private function validateNameLength($name, &$errors, &$valid) {
-    if(strlen($name) > 100) {
+    if (strlen($name) > 100) {
       $errors[] = "Name is above maximum length";
       $valid = false;
     }

api/Domain/Validators/PickValidator.php

Spacing +14 added lines, -14 removed lines

@@ -20,7 +20,7 @@ 
     $teams = $this->app['phpdraft.DraftDataRepository']->GetTeams($draft->draft_sport);
     $positions = $this->app['phpdraft.DraftDataRepository']->GetPositions($draft->draft_sport);
 
-    if(empty($pick->first_name)
+    if (empty($pick->first_name)
       || empty($pick->last_name)
       || empty($pick->team)
       || empty($pick->position)) {
@@ -28,32 +28,32 @@ 
       $valid = false;
     }
 
-    if($pick->draft_id != $draft->draft_id) {
+    if ($pick->draft_id != $draft->draft_id) {
       $errors[] = "Pick does not belong to draft #$draft->draft_id.";
       $valid = false;
     }
 
-    if(strlen($pick->first_name) > 255) {
+    if (strlen($pick->first_name) > 255) {
       $errors[] = "First name is above maximum length.";
       $valid = false;
     }
 
-    if(strlen($pick->last_name) > 255) {
+    if (strlen($pick->last_name) > 255) {
       $errors[] = "Last name is above maximum length.";
       $valid = false;
     }
 
-    if($draft->draft_current_pick != $pick->player_pick) {
+    if ($draft->draft_current_pick != $pick->player_pick) {
       $errors[] = "Pick #$pick->player_pick is not the current pick for draft #$draft->draft_id.";
       $valid = false;
     }
 
-    if(!array_key_exists($pick->team, $teams)) {
+    if (!array_key_exists($pick->team, $teams)) {
       $errors[] = "Team $pick->team is an invalid value.";
       $valid = false;
     }
 
-    if(!array_key_exists($pick->position, $positions)) {
+    if (!array_key_exists($pick->position, $positions)) {
       $errors[] = "Position $pick->position is an invalid value.";
       $valid = false;
     }
@@ -67,7 +67,7 @@ 
     $teams = $this->app['phpdraft.DraftDataRepository']->GetTeams($draft->draft_sport);
     $positions = $this->app['phpdraft.DraftDataRepository']->GetPositions($draft->draft_sport);
 
-    if(empty($pick->first_name)
+    if (empty($pick->first_name)
       || empty($pick->last_name)
       || empty($pick->team)
       || empty($pick->position)) {
@@ -75,27 +75,27 @@ 
       $valid = false;
     }
 
-    if($pick->draft_id != $draft->draft_id) {
+    if ($pick->draft_id != $draft->draft_id) {
       $errors[] = "Pick does not belong to draft #$draft->draft_id.";
       $valid = false;
     }
 
-    if(strlen($pick->first_name) > 255) {
+    if (strlen($pick->first_name) > 255) {
       $errors[] = "First name is above maximum length.";
       $valid = false;
     }
 
-    if(strlen($pick->last_name) > 255) {
+    if (strlen($pick->last_name) > 255) {
       $errors[] = "Last name is above maximum length.";
       $valid = false;
     }
 
-    if(!array_key_exists($pick->team, $teams)) {
+    if (!array_key_exists($pick->team, $teams)) {
       $errors[] = "Team $pick->team is an invalid value.";
       $valid = false;
     }
 
-    if(!array_key_exists($pick->position, $positions)) {
+    if (!array_key_exists($pick->position, $positions)) {
       $errors[] = "Position $pick->position is an invalid value.";
       $valid = false;
     }
@@ -107,7 +107,7 @@ 
     $valid = true;
     $errors = array();
 
-    if($pick->draft_id != $draft->draft_id) {
+    if ($pick->draft_id != $draft->draft_id) {
       $errors[] = "Pick does not belong to draft #$draft->draft_id.";
       $valid = false;
     }

api/Domain/Validators/DepthChartPositionValidator.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     $errors = array();
     $draft_sports = $this->app['phpdraft.DraftDataRepository']->GetSports();
 
-    if(strlen($draft_sport) < 3 || strlen($draft_sport) > 4 || strlen($draft_sports[$draft_sport]) == 0) {
+    if (strlen($draft_sport) < 3 || strlen($draft_sport) > 4 || strlen($draft_sports[$draft_sport]) == 0) {
       $errors[] = "Draft sport is an invalid value.";
       $valid = false;
     }
@@ -29,28 +29,28 @@ 
     $valid = true;
     $errors = array();
 
-    if(count($depthChartPositionCreateModel->positions) !== count(array_unique($depthChartPositionCreateModel->positions))) {
+    if (count($depthChartPositionCreateModel->positions) !== count(array_unique($depthChartPositionCreateModel->positions))) {
       $valid = false;
       $errors[] = "One or more of the positions are not unique.";
     }
 
     $rounds = 0;
 
-    foreach($depthChartPositionCreateModel->positions as $depthChartPosition) {
+    foreach ($depthChartPositionCreateModel->positions as $depthChartPosition) {
       $rounds += (int)$depthChartPosition->slots;
     }
 
-    if($rounds == 0) {
+    if ($rounds == 0) {
       $valid = false;
       $errors[] = "The depth chart positions must specify at least 1 slot";
     }
 
-    if($rounds > 30) {
+    if ($rounds > 30) {
       $valid = false;
       $errors[] = "The depth chart positions cannot specify more than 30 slots in total.";
     }
 
-    if(count($depthChartPositionCreateModel->positions) > 30) {
+    if (count($depthChartPositionCreateModel->positions) > 30) {
       $valid = false;
       $errors[] = "Too many depth chart positions have been provided - 30 is the maximum.";
     }

api/Domain/Validators/DraftValidator.php

Spacing +25 added lines, -25 removed lines

@@ -21,11 +21,11 @@ 
     $current_user = $this->app['phpdraft.LoginUserService']->GetUserFromHeaderToken($request);
     $draft_password = $request->headers->get(DRAFT_PASSWORD_HEADER, '');
 
-    if($current_user != null && ($draft->commish_id == $current_user->id || $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user))) {
+    if ($current_user != null && ($draft->commish_id == $current_user->id || $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user))) {
       return true;
     }
 
-    if(empty($draft->draft_password) || ($draft->draft_password == $draft_password)) {
+    if (empty($draft->draft_password) || ($draft->draft_password == $draft_password)) {
       return true;
     }
 
@@ -33,11 +33,11 @@ 
   }
 
   public function IsDraftEditableForUser(Draft $draft, LoginUser $current_user) {
-    if(!empty($current_user) && !empty($draft) && $draft->commish_id == $current_user->id) {
+    if (!empty($current_user) && !empty($draft) && $draft->commish_id == $current_user->id) {
       return true;
     }
 
-    if(!empty($current_user) && $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user)) {
+    if (!empty($current_user) && $this->app['phpdraft.LoginUserService']->CurrentUserIsAdmin($current_user)) {
       return true;
     }
 
@@ -50,7 +50,7 @@ 
     $draft_sports = $this->app['phpdraft.DraftDataRepository']->GetSports();
     $draft_styles = $this->app['phpdraft.DraftDataRepository']->GetStyles();
 
-    if(empty($draft->commish_id)
+    if (empty($draft->commish_id)
       || empty($draft->draft_name)
       || empty($draft->draft_sport)
       || empty($draft->draft_style)) {
@@ -58,33 +58,33 @@ 
       $valid = false;
     }
 
-    if(!empty($draft->draft_password) && strlen($draft->draft_password) > 255) {
+    if (!empty($draft->draft_password) && strlen($draft->draft_password) > 255) {
       $errors[] = "Password is above maximum length.";
       $valid = false;
     }
 
-    if(strlen($draft->draft_name) > 255) {
+    if (strlen($draft->draft_name) > 255) {
       $errors[] = "Draft name is above maximum length";
       $valid = false;
     }
 
-    if(strlen($draft->draft_sport) < 3 || strlen($draft->draft_sport) > 4 || strlen($draft_sports[$draft->draft_sport]) == 0) {
+    if (strlen($draft->draft_sport) < 3 || strlen($draft->draft_sport) > 4 || strlen($draft_sports[$draft->draft_sport]) == 0) {
       $errors[] = "Draft sport is an invalid value.";
       $valid = false;
     }
 
-    if(!array_key_exists($draft->draft_style, $draft_styles)) {
+    if (!array_key_exists($draft->draft_style, $draft_styles)) {
 
       $errors[] = "Draft style is an invalid value.";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.DraftRepository']->NameIsUnique($draft->draft_name, $draft->draft_id)) {
+    if (!$this->app['phpdraft.DraftRepository']->NameIsUnique($draft->draft_name, $draft->draft_id)) {
       $errors[] = "Draft name is already taken, please choose a different name.";
       $valid = false;
     }
 
-    if($draft->draft_rounds < 1 || $draft->draft_rounds > 30) {
+    if ($draft->draft_rounds < 1 || $draft->draft_rounds > 30) {
       $errors[] = "Invalid number of draft rounds.";
       $valid = false;
     }
@@ -97,27 +97,27 @@ 
     $errors = array();
     $draft_statuses = $this->app['phpdraft.DraftDataRepository']->GetStatuses();
 
-    if($old_status == "complete") {
+    if ($old_status == "complete") {
       $valid = false;
       $errors[] = "The draft is completed, therefore its status cannot be changed.";
     }
 
-    if($draft->draft_status == "complete") {
+    if ($draft->draft_status == "complete") {
       $valid = false;
       $errors[] = "You cannot set the draft as completed manually.";
     }
 
-    if(empty($draft->draft_status)) {
+    if (empty($draft->draft_status)) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if(!array_key_exists($draft->draft_status, $draft_statuses)) {
+    if (!array_key_exists($draft->draft_status, $draft_statuses)) {
       $errors[] = "Draft status is an invalid value.";
       $valid = false;
     }
 
-    if($draft->draft_status == "in_progress" && !$this->app['phpdraft.ManagerRepository']->DraftHasManagers($draft->draft_id)) {
+    if ($draft->draft_status == "in_progress" && !$this->app['phpdraft.ManagerRepository']->DraftHasManagers($draft->draft_id)) {
       $valid = false;
       $errors[] = "A draft must have at least 2 managers before it can begin.";
     }
@@ -132,7 +132,7 @@ 
     $current_status_text = strtolower($draft_statuses[$draft->draft_status]);
     $is_setting_up = $this->app['phpdraft.DraftService']->DraftSettingUp($draft);
 
-    if(!$is_setting_up) {
+    if (!$is_setting_up) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }
@@ -148,7 +148,7 @@ 
     $is_setting_up = $this->app['phpdraft.DraftService']->DraftSettingUp($draft);
     $is_in_progress = $this->app['phpdraft.DraftService']->DraftInProgress($draft);
 
-    if(!$is_setting_up && !$is_in_progress) {
+    if (!$is_setting_up && !$is_in_progress) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }
@@ -163,7 +163,7 @@ 
     $current_status_text = strtolower($draft_statuses[$draft->draft_status]);
     $is_in_progress = $this->app['phpdraft.DraftService']->DraftInProgress($draft);
 
-    if(!$is_in_progress) {
+    if (!$is_in_progress) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }
@@ -179,7 +179,7 @@ 
     $is_in_progress = $this->app['phpdraft.DraftService']->DraftInProgress($draft);
     $is_complete = $this->app['phpdraft.DraftService']->DraftComplete($draft);
 
-    if(!$is_complete && !$is_in_progress) {
+    if (!$is_complete && !$is_in_progress) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }
@@ -196,7 +196,7 @@ 
     $is_complete = $this->app['phpdraft.DraftService']->DraftComplete($draft);
     $isLessThanTenMinutes = false;
 
-    if($is_complete) {
+    if ($is_complete) {
       $utc_timezone = new \DateTimeZone("UTC");
       $now_utc = new \DateTime(null, $utc_timezone);
       $end_time = new \DateTime($draft->draft_end_time, $utc_timezone);
@@ -204,17 +204,17 @@ 
       $end_seconds = $end_time->getTimestamp();
       $seconds_elapsed = $end_seconds - $now_seconds;
 
-      if($seconds_elapsed < 600) {
+      if ($seconds_elapsed < 600) {
         $isLessThanTenMinutes = true;
       }
     }
 
-    if(!$is_complete && !$is_in_progress) {
+    if (!$is_complete && !$is_in_progress) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }
 
-    if($is_complete && !$isLessThanTenMinutes) {
+    if ($is_complete && !$isLessThanTenMinutes) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is complete and beyond the ten minute grace period.";
     }
@@ -229,7 +229,7 @@ 
     $current_status_text = strtolower($draft_statuses[$draft->draft_status]);
     $is_complete = $this->app['phpdraft.DraftService']->DraftComplete($draft);
 
-    if(!$is_complete) {
+    if (!$is_complete) {
       $valid = false;
       $errors[] = "Unable to work on draft #$draft->draft_id: draft is $current_status_text";
     }

api/Domain/Services/UtilityService.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
   }
 
   public function ConvertTimeForClientDisplay($time_value) {
-    if(empty($time_value)) {
+    if (empty($time_value)) {
       return null;
     }
 
@@ -19,7 +19,7 @@ 
     $supposed_utc_index = $time_value_length > 3 ? $time_value_length - 3 : 0;
     $utc_index = strstr($time_value, "UTC");
 
-    if($utc_index == $supposed_utc_index) {
+    if ($utc_index == $supposed_utc_index) {
       return $time_value;
     } else {
       return $time_value . " UTC";

api/Domain/Services/DepthChartPositionService.php

Spacing +5 added lines, -5 removed lines

@@ -30,19 +30,19 @@
 
       $unassignedPicks = array();
 
-      foreach($allManagerPicks as $pick) {
-        if(is_null($pick->depth_chart_position_id)) {
+      foreach ($allManagerPicks as $pick) {
+        if (is_null($pick->depth_chart_position_id)) {
           $unassignedPicks[] = $pick;
         }
       }
 
       $response->depthChartPositions[] = new DepthChartDisplayModel(null, 'Unassigned', null, $unassignedPicks);
 
-      foreach($depthChartPositions as $position) {
+      foreach ($depthChartPositions as $position) {
         $picks = array();
 
-        foreach($allManagerPicks as $pick) {
-          if($pick->depth_chart_position_id == $position->id) {
+        foreach ($allManagerPicks as $pick) {
+          if ($pick->depth_chart_position_id == $position->id) {
             $picks[] = $pick;
           }
         }

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;