@@ -169,8 +169,9 @@ |
||
| 169 | 169 | |
| 170 | 170 | public function buildName() |
| 171 | 171 | { |
| 172 | - if ($this->settings != null && $this->settings->alias != null) |
|
| 173 | - return $this->settings->alias; |
|
| 172 | + if ($this->settings != null && $this->settings->alias != null) { |
|
| 173 | + return $this->settings->alias; |
|
| 174 | + } |
|
| 174 | 175 | |
| 175 | 176 | if ($this->hasNoCustomSettings()) { |
| 176 | 177 | return $this->category->name; |
@@ -46,7 +46,9 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | protected static function getFightersWithByes(FightersGroup $group) |
| 48 | 48 | { |
| 49 | - if ($group == null) return null; |
|
| 49 | + if ($group == null) { |
|
| 50 | + return null; |
|
| 51 | + } |
|
| 50 | 52 | $fighters = $group->getFighters(); |
| 51 | 53 | $fighterType = $group->getFighterType(); |
| 52 | 54 | if (sizeof($fighters) == 0) { |
@@ -167,18 +169,26 @@ discard block |
||
| 167 | 169 | */ |
| 168 | 170 | public function hasDeterminedParent() |
| 169 | 171 | { |
| 170 | - if ($this->has2Fighters()) return true; |
|
| 172 | + if ($this->has2Fighters()) { |
|
| 173 | + return true; |
|
| 174 | + } |
|
| 171 | 175 | foreach ($this->group->children as $child) { |
| 172 | 176 | $fight = $child->fights->get(0); |
| 173 | - if ($fight->has2Fighters()) return false; |
|
| 177 | + if ($fight->has2Fighters()) { |
|
| 178 | + return false; |
|
| 179 | + } |
|
| 174 | 180 | } |
| 175 | 181 | return true; |
| 176 | 182 | } |
| 177 | 183 | |
| 178 | 184 | public function shouldBeInFightList() |
| 179 | 185 | { |
| 180 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
| 181 | - if ($this->has2Fighters()) return true; |
|
| 186 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
| 187 | + return false; |
|
| 188 | + } |
|
| 189 | + if ($this->has2Fighters()) { |
|
| 190 | + return true; |
|
| 191 | + } |
|
| 182 | 192 | // We aint in the first round, and there is 1 or 0 competitor |
| 183 | 193 | // We check children, and see : |
| 184 | 194 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -204,7 +214,9 @@ discard block |
||
| 204 | 214 | private function belongsToFirstRound() |
| 205 | 215 | { |
| 206 | 216 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
| 207 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
| 217 | + if (in_array($this->id, $firstRoundFights)) { |
|
| 218 | + return true; |
|
| 219 | + } |
|
| 208 | 220 | return false; |
| 209 | 221 | } |
| 210 | 222 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | if ($this->championship->category->isTeam){ |
| 72 | 72 | $championship = $this->championship->withCount('teams', 'competitors')->find(2); |
| 73 | - }else{ |
|
| 73 | + } else{ |
|
| 74 | 74 | $championship = $this->championship->withCount('teams', 'competitors')->first(); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -90,7 +90,9 @@ discard block |
||
| 90 | 90 | { |
| 91 | 91 | foreach ($fightsByRound as $fight) { |
| 92 | 92 | $parentGroup = $fight->group->parent; |
| 93 | - if ($parentGroup == null) break; |
|
| 93 | + if ($parentGroup == null) { |
|
| 94 | + break; |
|
| 95 | + } |
|
| 94 | 96 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
| 95 | 97 | |
| 96 | 98 | // IN this $fight, is c1 or c2 has the info? |
@@ -164,10 +166,14 @@ discard block |
||
| 164 | 166 | */ |
| 165 | 167 | public function hasDeterminedParent() |
| 166 | 168 | { |
| 167 | - if ($this->group->has2Fighters()) return true; |
|
| 169 | + if ($this->group->has2Fighters()) { |
|
| 170 | + return true; |
|
| 171 | + } |
|
| 168 | 172 | foreach ($this->group->children as $child) { |
| 169 | 173 | $fight = $child->fights->get(0); |
| 170 | - if ($fight->has2Fighters()) return false; |
|
| 174 | + if ($fight->has2Fighters()) { |
|
| 175 | + return false; |
|
| 176 | + } |
|
| 171 | 177 | } |
| 172 | 178 | return true; |
| 173 | 179 | } |