@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('fight', function (Blueprint $table) { |
|
| 16 | + Schema::create('fight', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('short_id')->unsigned()->nullable(); |
| 19 | 19 | $table->integer('fighters_group_id')->unsigned()->index(); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('category', function (Blueprint $table) { |
|
| 15 | + Schema::create('category', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('gender')->nullable(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $table->engine = 'InnoDB'; |
| 29 | 29 | }); |
| 30 | 30 | |
| 31 | - Schema::create('championship', function (Blueprint $table) { |
|
| 31 | + Schema::create('championship', function(Blueprint $table) { |
|
| 32 | 32 | $table->increments('id'); |
| 33 | 33 | $table->integer('tournament_id')->unsigned()->index(); |
| 34 | 34 | $table->integer('category_id')->unsigned()->index(); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $table->engine = 'InnoDB'; |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | - Schema::create('competitor', function (Blueprint $table) { |
|
| 53 | + Schema::create('competitor', function(Blueprint $table) { |
|
| 54 | 54 | $table->increments('id'); |
| 55 | 55 | $table->integer('short_id')->unsigned()->nullable(); |
| 56 | 56 | $table->integer('championship_id')->unsigned()->index(); |
@@ -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->tinyInteger('short_id')->unsigned()->nullable(); |
| 19 | 19 | $table->integer('championship_id')->unsigned()->index(); |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | { |
| 48 | 48 | if ($this->championship->hasPreliminary()) { |
| 49 | 49 | $fightersGroup = $fightersByEntity->chunk($this->settings->preliminaryGroupSize); |
| 50 | - if (!App::runningUnitTests()){ |
|
| 50 | + if (!App::runningUnitTests()) { |
|
| 51 | 51 | $fightersGroup = $fightersGroup->shuffle(); |
| 52 | 52 | } |
| 53 | 53 | } else { // Round Robin |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use Faker\Factory as Faker; |
|
| 4 | 3 | use Illuminate\Database\Seeder; |
| 5 | 4 | use Illuminate\Foundation\Auth\User; |
| 6 | 5 | use Xoco70\KendoTournaments\Models\Championship; |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | ); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
| 66 | + $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
| 67 | 67 | $generation = $championship->chooseGenerationStrategy(); |
| 68 | 68 | |
| 69 | 69 | try { |
@@ -49,7 +49,9 @@ |
||
| 49 | 49 | { |
| 50 | 50 | foreach ($fightsByRound as $fight) { |
| 51 | 51 | $parentGroup = $fight->group->parent; |
| 52 | - if ($parentGroup == null) break; |
|
| 52 | + if ($parentGroup == null) { |
|
| 53 | + break; |
|
| 54 | + } |
|
| 53 | 55 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
| 54 | 56 | |
| 55 | 57 | // IN this $fight, is c1 or c2 has the info? |
@@ -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 | |
@@ -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 | * @return FightersGroup |
| 182 | 182 | */ |
| 183 | 183 | protected function saveGroup($area, $order, $round): FightersGroup |
@@ -334,8 +334,8 @@ discard block |
||
| 334 | 334 | |
| 335 | 335 | /** |
| 336 | 336 | * @param Collection $fighters |
| 337 | - * @param $frequency |
|
| 338 | - * @param $sizeGroupBy |
|
| 337 | + * @param integer $frequency |
|
| 338 | + * @param integer $sizeGroupBy |
|
| 339 | 339 | * @param $bye |
| 340 | 340 | * @return Collection |
| 341 | 341 | */ |
@@ -358,8 +358,8 @@ discard block |
||
| 358 | 358 | /** |
| 359 | 359 | * @param $frequency |
| 360 | 360 | * @param $sizeGroupBy |
| 361 | - * @param $count |
|
| 362 | - * @param $byeCount |
|
| 361 | + * @param integer $count |
|
| 362 | + * @param integer $byeCount |
|
| 363 | 363 | * @return bool |
| 364 | 364 | */ |
| 365 | 365 | private function shouldInsertBye($frequency, $sizeGroupBy, $count, $byeCount): bool |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | private function getMaxFightersByEntity($userGroups): int |
| 56 | 56 | { |
| 57 | 57 | return $userGroups |
| 58 | - ->sortByDesc(function ($group) { |
|
| 58 | + ->sortByDesc(function($group) { |
|
| 59 | 59 | return $group->count(); |
| 60 | 60 | }) |
| 61 | 61 | ->first() |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | protected function getTreeSize($fighterCount, $groupSize) |
| 94 | 94 | { |
| 95 | 95 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
| 96 | - $squareMultiplied = $square->map(function ($item) use ($groupSize) { |
|
| 96 | + $squareMultiplied = $square->map(function($item) use ($groupSize) { |
|
| 97 | 97 | return $item * $groupSize; |
| 98 | 98 | }); |
| 99 | 99 | |