@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * Get the biggest entity group |
| 51 | - * @param $userGroups |
|
| 51 | + * @param Collection $userGroups |
|
| 52 | 52 | * |
| 53 | 53 | * @return int |
| 54 | 54 | */ |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | /** |
| 109 | 109 | * Repart BYE in the tree, |
| 110 | - * @param $fighterGroups |
|
| 110 | + * @param Collection $fighterGroups |
|
| 111 | 111 | * @param int $max |
| 112 | 112 | * |
| 113 | 113 | * @return Collection |
@@ -175,9 +175,9 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | - * @param $area |
|
| 179 | - * @param $order |
|
| 180 | - * @param $round |
|
| 178 | + * @param integer $area |
|
| 179 | + * @param integer $order |
|
| 180 | + * @param integer $round |
|
| 181 | 181 | * @param $parent |
| 182 | 182 | * @return FightersGroup |
| 183 | 183 | */ |
@@ -338,8 +338,8 @@ discard block |
||
| 338 | 338 | |
| 339 | 339 | /** |
| 340 | 340 | * @param Collection $fighters |
| 341 | - * @param $frequency |
|
| 342 | - * @param $sizeGroupBy |
|
| 341 | + * @param integer $frequency |
|
| 342 | + * @param integer $sizeGroupBy |
|
| 343 | 343 | * @param $bye |
| 344 | 344 | * @return Collection |
| 345 | 345 | */ |
@@ -362,8 +362,8 @@ discard block |
||
| 362 | 362 | /** |
| 363 | 363 | * @param $frequency |
| 364 | 364 | * @param $sizeGroupBy |
| 365 | - * @param $count |
|
| 366 | - * @param $byeCount |
|
| 365 | + * @param integer $count |
|
| 366 | + * @param integer $byeCount |
|
| 367 | 367 | * @return bool |
| 368 | 368 | */ |
| 369 | 369 | private function shouldInsertBye($frequency, $sizeGroupBy, $count, $byeCount): bool |
@@ -10,8 +10,6 @@ |
||
| 10 | 10 | use Xoco70\KendoTournaments\Models\Championship; |
| 11 | 11 | use Xoco70\KendoTournaments\Models\ChampionshipSettings; |
| 12 | 12 | use Xoco70\KendoTournaments\Models\Competitor; |
| 13 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 14 | -use Xoco70\KendoTournaments\Models\FightersGroup; |
|
| 15 | 13 | use Xoco70\KendoTournaments\Models\Tournament; |
| 16 | 14 | |
| 17 | 15 | class TreeController extends Controller |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Illuminate\Support\Facades\App; |
| 7 | 7 | use Xoco70\KendoTournaments\Models\Championship; |
| 8 | 8 | use Xoco70\KendoTournaments\Models\DirectEliminationFight; |
| 9 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 10 | 9 | |
| 11 | 10 | class DirectEliminationTreeGen extends TreeGen |
| 12 | 11 | { |
@@ -86,7 +86,9 @@ discard block |
||
| 86 | 86 | { |
| 87 | 87 | foreach ($fightsByRound as $fight) { |
| 88 | 88 | $parentGroup = $fight->group->parent; |
| 89 | - if ($parentGroup == null) break; |
|
| 89 | + if ($parentGroup == null) { |
|
| 90 | + break; |
|
| 91 | + } |
|
| 90 | 92 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
| 91 | 93 | |
| 92 | 94 | // IN this $fight, is c1 or c2 has the info? |
@@ -160,10 +162,14 @@ discard block |
||
| 160 | 162 | */ |
| 161 | 163 | public function hasDeterminedParent() |
| 162 | 164 | { |
| 163 | - if ($this->group->has2Fighters()) return true; |
|
| 165 | + if ($this->group->has2Fighters()) { |
|
| 166 | + return true; |
|
| 167 | + } |
|
| 164 | 168 | foreach ($this->group->children as $child) { |
| 165 | 169 | $fight = $child->fights->get(0); |
| 166 | - if ($fight->has2Fighters()) return false; |
|
| 170 | + if ($fight->has2Fighters()) { |
|
| 171 | + return false; |
|
| 172 | + } |
|
| 167 | 173 | } |
| 168 | 174 | return true; |
| 169 | 175 | } |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Illuminate\Support\Collection; |
| 6 | 6 | use Illuminate\Support\Facades\App; |
| 7 | 7 | use Xoco70\KendoTournaments\Models\Championship; |
| 8 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 9 | 8 | use Xoco70\KendoTournaments\Models\PreliminaryFight; |
| 10 | 9 | |
| 11 | 10 | class PlayOffTreeGen extends TreeGen |
@@ -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 | |