@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | $fighter1 = $item->team1 != null ? $item->team1->name : "Bye"; |
6 | 6 | $fighter2 = $item->team2 != null ? $item->team2->name : "Bye"; |
7 | - }else{ |
|
7 | + } else{ |
|
8 | 8 | $fighter1 = $item->competitors->get(0) != null ? $item->competitors->get(0)->user->name : "Bye"; |
9 | 9 | $fighter2 = $item->competitors->get(1) != null ? $item->competitors->get(1)->user->name : "Bye"; |
10 | 10 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | - * @param $settings |
|
66 | + * @param ChampionshipSettings $settings |
|
67 | 67 | * @param Championship $championship |
68 | 68 | */ |
69 | 69 | public static function generateFights(Collection $rounds, $settings, Championship $championship = null) |
@@ -247,8 +247,8 @@ discard block |
||
247 | 247 | } |
248 | 248 | |
249 | 249 | /** |
250 | - * @param $usersByArea |
|
251 | - * @param $area |
|
250 | + * @param Collection $usersByArea |
|
251 | + * @param integer $area |
|
252 | 252 | * |
253 | 253 | * @return Collection |
254 | 254 | */ |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | /** |
284 | 284 | * @param $area |
285 | 285 | * @param $fighters |
286 | - * @param $order |
|
286 | + * @param integer $order |
|
287 | 287 | * |
288 | 288 | * @return Round |
289 | 289 | */ |
@@ -149,8 +149,9 @@ |
||
149 | 149 | { |
150 | 150 | |
151 | 151 | |
152 | - if ($this->settings != null && $this->settings->alias != null && $this->settings->alias != '') |
|
153 | - return $this->settings->alias; |
|
152 | + if ($this->settings != null && $this->settings->alias != null && $this->settings->alias != '') { |
|
153 | + return $this->settings->alias; |
|
154 | + } |
|
154 | 155 | |
155 | 156 | $genders = [ |
156 | 157 | 'M' => trans('categories.male'), |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | //Set the match to null as the result of the above match hasn't yet been determined |
107 | 107 | $match = null; |
108 | 108 | |
109 | - }else{ |
|
109 | + } else{ |
|
110 | 110 | |
111 | 111 | //If only the first or second player exists, then replace the multidimensional array with the existing player |
112 | 112 | $match = $match[0] ? $match[0] : $match[1]; |
@@ -121,7 +121,9 @@ discard block |
||
121 | 121 | } |
122 | 122 | |
123 | 123 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number |
124 | - if(count($this->brackets)) $roundNumber++; |
|
124 | + if(count($this->brackets)) { |
|
125 | + $roundNumber++; |
|
126 | + } |
|
125 | 127 | |
126 | 128 | //Create the first full round of teams, some may be blank if waiting on the results of a previous round |
127 | 129 | for($i = 0; $i < count($matches); $i++){ |
@@ -174,7 +176,7 @@ discard block |
||
174 | 176 | |
175 | 177 | if(!($matchNumber % 2)){ |
176 | 178 | $match['hConnector2Top'] = $match['vConnectorTop'] -= ($match['vConnectorHeight'] - $this->borderWidth); |
177 | - }else{ |
|
179 | + } else{ |
|
178 | 180 | $match['hConnector2Top'] = $match['vConnectorTop'] + ($match['vConnectorHeight'] - $this->borderWidth); |
179 | 181 | } |
180 | 182 | |
@@ -231,15 +233,15 @@ discard block |
||
231 | 233 | |
232 | 234 | $roundTitles = array('Final'); |
233 | 235 | |
234 | - }elseif($this->noTeams <= 4){ |
|
236 | + } elseif($this->noTeams <= 4){ |
|
235 | 237 | |
236 | 238 | $roundTitles = array('Semi-Finals', 'Final'); |
237 | 239 | |
238 | - }elseif($this->noTeams <= 8){ |
|
240 | + } elseif($this->noTeams <= 8){ |
|
239 | 241 | |
240 | 242 | $roundTitles = array('Quarter-Finals', 'Semi-Finals', 'Final'); |
241 | 243 | |
242 | - }else{ |
|
244 | + } else{ |
|
243 | 245 | |
244 | 246 | $roundTitles = array('Quarter-Finals', 'Semi-Finals', 'Final'); |
245 | 247 | $noRounds = ceil(log($this->noTeams, 2)); |