@@ -71,7 +71,7 @@ |
||
| 71 | 71 | |
| 72 | 72 | // Delete previous fight for this championship |
| 73 | 73 | |
| 74 | - $arrGroupsId = $fightersGroup->map(function ($value, $key) { |
|
| 74 | + $arrGroupsId = $fightersGroup->map(function($value, $key) { |
|
| 75 | 75 | return $value->id; |
| 76 | 76 | })->toArray(); |
| 77 | 77 | Fight::destroy($arrGroupsId); |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | 66 | * @param Collection $fightersGroup |
| 67 | - * @param $settings |
|
| 67 | + * @param ChampionshipSettings $settings |
|
| 68 | 68 | */ |
| 69 | 69 | public static function generateFights(Collection $fightersGroup, $settings, Championship $championship = null) |
| 70 | 70 | { |
@@ -77,11 +77,11 @@ |
||
| 77 | 77 | FightersGroup::generateFights($groups, $settings, $championship); |
| 78 | 78 | } catch (TreeGenerationException $e) { |
| 79 | 79 | redirect()->back() |
| 80 | - ->withErrors([$numFighters ."-".$e->getMessage()]); |
|
| 80 | + ->withErrors([$numFighters . "-" . $e->getMessage()]); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | return redirect()->back() |
| 84 | 84 | ->with('numFighters', $numFighters) |
| 85 | - ->with(['success' , "Success"]); |
|
| 85 | + ->with(['success', "Success"]); |
|
| 86 | 86 | } |
| 87 | 87 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('fighters_groups', function (Blueprint $table) { |
|
| 16 | + Schema::create('fighters_groups', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('championship_id')->unsigned()->index(); |
| 19 | 19 | $table->tinyInteger('round')->default(0); // Eliminitory, 1/8, 1/4, etc. |
@@ -254,8 +254,9 @@ discard block |
||
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | /** |
| 257 | - * @param $usersByArea |
|
| 258 | - * @param $area |
|
| 257 | + * @param Collection $usersByArea |
|
| 258 | + * @param integer $area |
|
| 259 | + * @param integer $round |
|
| 259 | 260 | * |
| 260 | 261 | * @return Collection |
| 261 | 262 | */ |
@@ -289,7 +290,7 @@ discard block |
||
| 289 | 290 | /** |
| 290 | 291 | * @param $area |
| 291 | 292 | * @param $fighters |
| 292 | - * @param $order |
|
| 293 | + * @param integer $order |
|
| 293 | 294 | * @param $round |
| 294 | 295 | * @return FightersGroup |
| 295 | 296 | */ |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Xoco70\KendoTournaments\TreeGen; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | 5 | use Illuminate\Support\Collection; |
| 7 | 6 | use Xoco70\KendoTournaments\Contracts\TreeGenerable; |
| 8 | 7 | use Xoco70\KendoTournaments\Exceptions\TreeGenerationException; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | private function getTreeSize($fighterCount, $groupSize) |
| 156 | 156 | { |
| 157 | 157 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
| 158 | - $squareMultiplied = $square->map(function ($item, $key) use ($groupSize) { |
|
| 158 | + $squareMultiplied = $square->map(function($item, $key) use ($groupSize) { |
|
| 159 | 159 | return $item * $groupSize; |
| 160 | 160 | }); |
| 161 | 161 | |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // Chunking to make small round robin groups |
| 265 | 265 | if ($this->championship->hasPreliminary()) { |
| 266 | 266 | $fightersGroup = $fightersByEntity->chunk($this->settings->preliminaryGroupSize)->shuffle(); |
| 267 | - } elseif ($this->championship->isDirectEliminationType() || $round>1) { |
|
| 267 | + } elseif ($this->championship->isDirectEliminationType() || $round > 1) { |
|
| 268 | 268 | $fightersGroup = $fightersByEntity->chunk(2)->shuffle(); |
| 269 | 269 | } else { // Round Robin |
| 270 | 270 | $fightersGroup = $fightersByEntity->chunk($fightersByEntity->count()); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('competitor_team', function (Blueprint $table) { |
|
| 16 | + Schema::create('competitor_team', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('team_id')->unsigned()->nullable()->index(); |
| 19 | 19 | $table->integer('competitor_id')->unsigned()->index(); |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | use Xoco70\KendoTournaments\TreeGen\DirectEliminationTreeGen; |
| 3 | 3 | |
| 4 | -$directEliminationTree = $championship->fightersGroups->where('round',1)->map(function ($item, $key) use ($championship) { |
|
| 5 | - if ($championship->category->isTeam()){ |
|
| 4 | +$directEliminationTree = $championship->fightersGroups->where('round', 1)->map(function($item, $key) use ($championship) { |
|
| 5 | + if ($championship->category->isTeam()) { |
|
| 6 | 6 | |
| 7 | 7 | $fighter1 = $item->team1 != null ? $item->team1->name : "Bye"; |
| 8 | 8 | $fighter2 = $item->team2 != null ? $item->team2->name : "Bye"; |
| 9 | - }else{ |
|
| 9 | + } else { |
|
| 10 | 10 | $fighter1 = $item->competitors->get(0) != null ? $item->competitors->get(0)->user->name : "Bye"; |
| 11 | 11 | $fighter2 = $item->competitors->get(1) != null ? $item->competitors->get(1)->user->name : "Bye"; |
| 12 | 12 | |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | |
| 7 | 7 | $fighter1 = $item->team1 != null ? $item->team1->name : "Bye"; |
| 8 | 8 | $fighter2 = $item->team2 != null ? $item->team2->name : "Bye"; |
| 9 | - }else{ |
|
| 9 | + } else{ |
|
| 10 | 10 | $fighter1 = $item->competitors->get(0) != null ? $item->competitors->get(0)->user->name : "Bye"; |
| 11 | 11 | $fighter2 = $item->competitors->get(1) != null ? $item->competitors->get(1)->user->name : "Bye"; |
| 12 | 12 | |
@@ -56,7 +56,9 @@ |
||
| 56 | 56 | $matches = array_chunk($teams, 2); |
| 57 | 57 | |
| 58 | 58 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number |
| 59 | - if (count($this->brackets)) $roundNumber++; |
|
| 59 | + if (count($this->brackets)) { |
|
| 60 | + $roundNumber++; |
|
| 61 | + } |
|
| 60 | 62 | |
| 61 | 63 | $countMatches = count($matches); |
| 62 | 64 | //Create the first full round of teams, some may be blank if waiting on the results of a previous round |