@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Xoco70\KendoTournaments\Models; |
4 | 4 | |
5 | -use Illuminate\Database\Eloquent\Model; |
|
6 | -use Illuminate\Support\Collection; |
|
7 | - |
|
8 | 5 | class DirectEliminationFight extends Fight |
9 | 6 | { |
10 | 7 |
@@ -46,7 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected static function getActorsToFights(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) { |
@@ -186,18 +188,26 @@ discard block |
||
186 | 188 | */ |
187 | 189 | public function hasDeterminedParent() |
188 | 190 | { |
189 | - if ($this->has2Fighters()) return true; |
|
191 | + if ($this->has2Fighters()) { |
|
192 | + return true; |
|
193 | + } |
|
190 | 194 | foreach ($this->group->children as $child) { |
191 | 195 | $fight = $child->fights->get(0); |
192 | - if ($fight->has2Fighters()) return false; |
|
196 | + if ($fight->has2Fighters()) { |
|
197 | + return false; |
|
198 | + } |
|
193 | 199 | } |
194 | 200 | return true; |
195 | 201 | } |
196 | 202 | |
197 | 203 | public function shouldBeInFightList() |
198 | 204 | { |
199 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
200 | - if ($this->has2Fighters()) return true; |
|
205 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
206 | + return false; |
|
207 | + } |
|
208 | + if ($this->has2Fighters()) { |
|
209 | + return true; |
|
210 | + } |
|
201 | 211 | // We aint in the first round, and there is 1 or 0 competitor |
202 | 212 | // We check children, and see : |
203 | 213 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -223,7 +233,9 @@ discard block |
||
223 | 233 | private function belongsToFirstRound() |
224 | 234 | { |
225 | 235 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
226 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
236 | + if (in_array($this->id, $firstRoundFights)) { |
|
237 | + return true; |
|
238 | + } |
|
227 | 239 | return false; |
228 | 240 | } |
229 | 241 |