Completed
Branch master (4f2bb7)
by Matthew
05:01
created
api/Controllers/Commish/IndexController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     //Leaving this here as we also grab roles below, but LoginUserService->GetCurrentUser() will fetch user via this method too:
15 15
     $token = $app['security']->getToken();
16 16
 
17
-    if($token !== null) {
17
+    if ($token !== null) {
18 18
       $usr = $token->getUser();
19 19
 
20 20
       $isAuthenticated = true;
Please login to merge, or discard this patch.
api/Controllers/Commish/ManagerController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
     $validity = $app['phpdraft.ManagerValidator']->IsManagerValidForCreate($draftId, $manager);
28 28
 
29
-    if(!$validity->success) {
29
+    if (!$validity->success) {
30 30
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
31 31
     }
32 32
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     $managersJson = $request->get('managers');
42 42
     $newManagers = array();
43 43
 
44
-    foreach($managersJson as $managerRequest) {
44
+    foreach ($managersJson as $managerRequest) {
45 45
       $newManager = new Manager();
46 46
       $newManager->draft_id = $draftId;
47 47
       $newManager->manager_name = $managerRequest['manager_name'];
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
     $validity = $app['phpdraft.ManagerValidator']->AreManagersValidForCreate($draftId, $newManagers);
53 53
 
54
-    if(!$validity->success) {
54
+    if (!$validity->success) {
55 55
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
56 56
     }
57 57
 
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
     $managersIdJson = $request->get('ordered_manager_ids');
67 67
     $managerIds = array();
68 68
 
69
-    foreach($managersIdJson as $managerId) {
69
+    foreach ($managersIdJson as $managerId) {
70 70
       $managerIds[] = (int)$managerId;
71 71
     }
72 72
 
73 73
     $validity = $app['phpdraft.ManagerValidator']->AreManagerIdsValidForOrdering($draftId, $managerIds);
74 74
 
75
-    if(!$validity->success) {
75
+    if (!$validity->success) {
76 76
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
77 77
     }
78 78
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     try {
89 89
       $draft = $app['phpdraft.DraftRepository']->Load($draftId);
90 90
       $manager = $app['phpdraft.ManagerRepository']->Load($managerId);
91
-    } catch(\Exception $e) {
91
+    } catch (\Exception $e) {
92 92
       $response = new PhpDraftResponse(false, array());
93 93
       $response->errors[] = "Unable to load manager #$managerId";
94 94
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
     $validity = $app['phpdraft.ManagerValidator']->IsManagerValidForUpdate($draft, $manager);
101 101
 
102
-    if(!$validity->success) {
102
+    if (!$validity->success) {
103 103
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
104 104
     }
105 105
 
@@ -114,14 +114,14 @@  discard block
 block discarded – undo
114 114
 
115 115
     try {
116 116
       $manager = $app['phpdraft.ManagerRepository']->Load($managerId);
117
-    } catch(\Exception $e) {
117
+    } catch (\Exception $e) {
118 118
       $response = new PhpDraftResponse(false, array());
119 119
       $response->errors[] = "Unable to delete manager #$managerId";
120 120
 
121 121
       return $app->json($response, Response::HTTP_BAD_REQUEST);
122 122
     }
123 123
 
124
-    if($manager->draft_id != $draftId) {
124
+    if ($manager->draft_id != $draftId) {
125 125
       $response = new PhpDraftResponse(false, array());
126 126
       $response->errors[] = "Unable to delete manager #$managerId";
127 127
 
Please login to merge, or discard this patch.
api/Controllers/Commish/UserProfileController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
   public function Get(Application $app, Request $request) {
13 13
     $user = $app['phpdraft.LoginUserService']->GetCurrentUser();
14 14
 
15
-    if(empty($user)) {
15
+    if (empty($user)) {
16 16
       return $app->json(new PhpDraftResponse(false));
17 17
     }
18 18
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
   public function Put(Application $app, Request $request) {
23 23
     $validity = $app['phpdraft.LoginUserValidator']->IsUserProfileUpdateValid($request);
24 24
 
25
-    if(!$validity->success) {
25
+    if (!$validity->success) {
26 26
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
27 27
     }
28 28
 
Please login to merge, or discard this patch.
api/Controllers/IndexController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
     $minified_css = '';
14 14
 
15
-    foreach($colors as $position => $hex_color_key) {
15
+    foreach ($colors as $position => $hex_color_key) {
16 16
       $minified_css .= "div.pick$position{background-color:$hex_color_key;}";
17 17
     }
18 18
 
Please login to merge, or discard this patch.
api/Controllers/DraftController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
     $draft_id = (int)$request->get('id');
12 12
     $getDraftData = $request->get('get_draft_data') == 'true';
13 13
 
14
-    if(empty($draft_id) || $draft_id == 0) {
14
+    if (empty($draft_id) || $draft_id == 0) {
15 15
       throw new \Exception("Unable to load draft.");
16 16
     }
17 17
 
Please login to merge, or discard this patch.
api/Controllers/PickController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     $draftId = (int)$request->get('draft_id');
31 31
     $amount = (int)$request->get('amount');
32 32
 
33
-    if($amount == 0) {
33
+    if ($amount == 0) {
34 34
       $amount = 10;
35 35
     }
36 36
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     $draftId = (int)$request->get('draft_id');
42 42
     $amount = (int)$request->get('amount');
43 43
 
44
-    if($amount == 0) {
44
+    if ($amount == 0) {
45 45
       $amount = 10;
46 46
     }
47 47
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
   public function GetAllManagerPicks(Application $app, Request $request) {
54 54
     $draftId = (int)$request->get('draft_id');
55
-    $managerId  = (int)$request->get('manager_id');
55
+    $managerId = (int)$request->get('manager_id');
56 56
 
57 57
     $draft = $app['phpdraft.DraftRepository']->Load($draftId);
58 58
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     #If there's a space and no matches so far, create another searches where we manually split them firstname/lastname by sace automatically
104 104
     $splitNameAutomatically = count($pickSearchModel->player_results) == 0 && strpos($keywords, " ") != false;
105 105
 
106
-    if($splitNameAutomatically) {
106
+    if ($splitNameAutomatically) {
107 107
       $pickSearchModel = new PickSearchModel($draftId, $keywords, $team, $position, $sort);
108 108
       $names = explode(" ", $keywords, 2);
109 109
       $pickSearchModel = $app['phpdraft.PickRepository']->SearchSplit($pickSearchModel, $names[0], $names[1]);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
       $pick = $app['phpdraft.PickRepository']->Load($pick_id);
122 122
 
123 123
       $pick->depth_chart_position_id = (int)$request->get('position_id');
124
-    } catch(\Exception $e) {
124
+    } catch (\Exception $e) {
125 125
       $response = new PhpDraftResponse(false, array());
126 126
       $response->errors[] = "Unable to edit pick #$pick_id";
127 127
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
     $validity = $app['phpdraft.PickValidator']->IsPickValidForDepthChartUpdate($draft, $pick);
132 132
 
133
-    if(!$validity->success) {
133
+    if (!$validity->success) {
134 134
       return $app->json($validity, $validity->responseType());
135 135
     }
136 136
 
Please login to merge, or discard this patch.
api/Controllers/ManagerController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,13 +17,13 @@
 block discarded – undo
17 17
     $draft_id = (int)$request->get('draft_id');
18 18
     $manager_id = (int)$request->get('manager_id');
19 19
 
20
-    if(empty($draft_id) || $draft_id == 0) {
20
+    if (empty($draft_id) || $draft_id == 0) {
21 21
       throw new \Exception("Unable to load draft.");
22 22
     }
23 23
 
24 24
     $draft = $app['phpdraft.DraftRepository']->Load($draft_id);
25 25
 
26
-    if(!$draft->using_depth_charts) {
26
+    if (!$draft->using_depth_charts) {
27 27
       $response = $app['phpdraft.ResponseFactory'](false, array("Draft is not configured to use depth charts."));
28 28
       return $app->json($response, $response->responseType());
29 29
     }
Please login to merge, or discard this patch.
api/Controllers/AuthenticationController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     try {
23 23
       $credentialValidity = $app['phpdraft.LoginUserValidator']->areLoginCredentialsValid($email, $password);
24 24
 
25
-      if($credentialValidity->success == false) {
25
+      if ($credentialValidity->success == false) {
26 26
         throw new UsernameNotFoundException(sprintf('Email %s does not exist', $email));
27 27
       }
28 28
 
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
         $response->auth_timeout = $authTimeout->format('Y-m-d H:i:s');
43 43
 
44 44
         //If user is enabled, provided valid password and has a verification (pwd reset) key, wipe it (no longer needed)
45
-        if($user->hasVerificationKey()) {
45
+        if ($user->hasVerificationKey()) {
46 46
           $app['phpdraft.LoginUserRepository']->EraseVerificationKey($user->getEmail());
47 47
         }
48 48
       }
49 49
     } catch (UsernameNotFoundException $e) {
50 50
       $response->success = false;
51
-      $response->errors[] =  'Invalid credentials.';
51
+      $response->errors[] = 'Invalid credentials.';
52 52
     }
53 53
 
54 54
     return $app->json($response, $response->responseType());
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
   public function Register(Application $app, Request $request) {
58 58
     $validity = $app['phpdraft.LoginUserValidator']->IsRegistrationUserValid($request);
59 59
 
60
-    if(!$validity->success) {
60
+    if (!$validity->success) {
61 61
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
62 62
     }
63 63
 
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
     $captcha = $request->get('_recaptcha');
71 71
     $userIp = $request->getClientIp();
72 72
 
73
-    if(!in_array($userIp, $whitelist)){
73
+    if (!in_array($userIp, $whitelist)) {
74 74
 
75 75
       $recaptcha = new \ReCaptcha\ReCaptcha(RECAPTCHA_SECRET);
76 76
       $recaptchaResponse = $recaptcha->verify($captcha, $userIp);
77 77
 
78
-      if(!$recaptchaResponse->isSuccess()) {
78
+      if (!$recaptchaResponse->isSuccess()) {
79 79
         $response = new PhpDraftResponse(false, array());
80 80
         $response->errors = $recaptchaResponse->getErrorCodes();
81 81
         return $app->json($response, $response->responseType());
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
   public function VerifyAccount(Application $app, Request $request) {
97 97
     $validity = $app['phpdraft.LoginUserValidator']->IsVerificationValid($request);
98 98
 
99
-    if(!$validity->success) {
99
+    if (!$validity->success) {
100 100
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
101 101
     }
102 102
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
   public function LostPassword(Application $app, Request $request) {
113 113
     $validity = $app['phpdraft.LoginUserValidator']->IsForgottenPasswordUserValid($request);
114 114
 
115
-    if(!$validity->success) {
115
+    if (!$validity->success) {
116 116
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
117 117
     }
118 118
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
     $captcha = $request->get('_recaptcha');
128 128
     $userIp = $request->getClientIp();
129 129
 
130
-    if(!in_array($userIp, $whitelist)){
130
+    if (!in_array($userIp, $whitelist)) {
131 131
 
132 132
       $recaptcha = new \ReCaptcha\ReCaptcha(RECAPTCHA_SECRET);
133 133
       $recaptchaResponse = $recaptcha->verify($captcha, $userIp);
134 134
 
135
-      if(!$recaptchaResponse->isSuccess()) {
135
+      if (!$recaptchaResponse->isSuccess()) {
136 136
         $response = new PhpDraftResponse(false, array());
137 137
         $response->errors = $recaptchaResponse->getErrorCodes();
138 138
         return $app->json($response, $response->responseType());
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
   public function ResetPassword(Application $app, Request $request) {
159 159
     $validity = $app['phpdraft.LoginUserValidator']->IsResetPasswordRequestValid($request);
160 160
 
161
-    if(!$validity->success) {
161
+    if (!$validity->success) {
162 162
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
163 163
     }
164 164
 
Please login to merge, or discard this patch.
EXAMPLE_appsettings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 
58 58
 );
59 59
 
60
-foreach($configuration_variables as $name => $value) {
60
+foreach ($configuration_variables as $name => $value) {
61 61
   define($name, $value);
62 62
 }
63 63
 
Please login to merge, or discard this patch.