@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | |
| 4 | -$factory->define(\Illuminate\Foundation\Auth\User::class, function (Faker\Generator $faker) { |
|
| 4 | +$factory->define(\Illuminate\Foundation\Auth\User::class, function(Faker\Generator $faker) { |
|
| 5 | 5 | $email = $faker->email; |
| 6 | 6 | |
| 7 | 7 | return [ |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Xoco70\LaravelTournaments\Models\Venue; |
| 4 | 4 | |
| 5 | -$factory->define(Venue::class, function (Faker\Generator $faker) { |
|
| 5 | +$factory->define(Venue::class, function(Faker\Generator $faker) { |
|
| 6 | 6 | return [ |
| 7 | 7 | 'venue_name' => $faker->colorName, |
| 8 | 8 | 'address' => $faker->streetName, |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Xoco70\LaravelTournaments\Models\Category as Cat; |
| 5 | 5 | |
| 6 | -$factory->define(Cat::class, function (Faker\Generator $faker) { |
|
| 6 | +$factory->define(Cat::class, function(Faker\Generator $faker) { |
|
| 7 | 7 | $name = ['categories.junior', |
| 8 | 8 | 'categories.junior_team', |
| 9 | 9 | 'categories.men_single', |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | use Xoco70\LaravelTournaments\Models\Tournament; |
| 5 | 5 | use Xoco70\LaravelTournaments\Models\Venue; |
| 6 | 6 | |
| 7 | -$factory->define(Tournament::class, function (Faker\Generator $faker) { |
|
| 7 | +$factory->define(Tournament::class, function(Faker\Generator $faker) { |
|
| 8 | 8 | $users = User::all()->pluck('id')->toArray(); |
| 9 | 9 | if (count($users) == 0) { |
| 10 | 10 | $user = factory(\Illuminate\Foundation\Auth\User::class)->create(); |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | use Xoco70\LaravelTournaments\Models\Championship; |
| 6 | 6 | use Xoco70\LaravelTournaments\Models\Tournament; |
| 7 | 7 | |
| 8 | -$factory->define(Championship::class, function (Faker\Generator $faker) { |
|
| 8 | +$factory->define(Championship::class, function(Faker\Generator $faker) { |
|
| 9 | 9 | $tournaments = Tournament::all()->pluck('id')->toArray(); |
| 10 | 10 | $categories = Cat::all()->pluck('id')->toArray(); |
| 11 | 11 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Xoco70\LaravelTournaments\Models\Team; |
| 4 | 4 | |
| 5 | -$factory->define(Team::class, function (Faker\Generator $faker) { |
|
| 5 | +$factory->define(Team::class, function(Faker\Generator $faker) { |
|
| 6 | 6 | return [ |
| 7 | 7 | 'name' => $faker->name, |
| 8 | 8 | 'championship_id' => 2, |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | use Xoco70\LaravelTournaments\Models\Championship; |
| 5 | 5 | use Xoco70\LaravelTournaments\Models\Competitor; |
| 6 | 6 | |
| 7 | -$factory->define(Competitor::class, function (Faker\Generator $faker) { |
|
| 7 | +$factory->define(Competitor::class, function(Faker\Generator $faker) { |
|
| 8 | 8 | $tcs = Championship::all()->pluck('id')->toArray(); |
| 9 | 9 | $users = User::all()->pluck('id')->toArray(); |
| 10 | 10 | $championshipId = $faker->randomElement($tcs); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | private function getMaxFightersByEntity($userGroups): int |
| 73 | 73 | { |
| 74 | 74 | return $userGroups |
| 75 | - ->sortByDesc(function ($group) { |
|
| 75 | + ->sortByDesc(function($group) { |
|
| 76 | 76 | return $group->count(); |
| 77 | 77 | }) |
| 78 | 78 | ->first() |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | protected function getTreeSize($fighterCount, $groupSize) |
| 114 | 114 | { |
| 115 | 115 | $squareMultiplied = collect([1, 2, 4, 8, 16, 32, 64]) |
| 116 | - ->map(function ($item) use ($groupSize) { |
|
| 116 | + ->map(function($item) use ($groupSize) { |
|
| 117 | 117 | return $item * $groupSize; |
| 118 | 118 | }); // [4, 8, 16, 32, 64,...] |
| 119 | 119 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $sizeGroupBy = count($byeGroup); |
| 172 | 172 | |
| 173 | 173 | $frequency = $sizeGroupBy != 0 |
| 174 | - ? (int) floor($sizeFighters / $sizeGroupBy) |
|
| 174 | + ? (int)floor($sizeFighters / $sizeGroupBy) |
|
| 175 | 175 | : -1; |
| 176 | 176 | |
| 177 | 177 | // Create Copy of $competitors |
@@ -22,8 +22,14 @@ discard block |
||
| 22 | 22 | abstract protected function generateFights(); |
| 23 | 23 | |
| 24 | 24 | |
| 25 | + /** |
|
| 26 | + * @param string|null $fighterToUpdate |
|
| 27 | + */ |
|
| 25 | 28 | abstract protected function addFighterToGroup(FightersGroup $group, $fighter, $fighterToUpdate); |
| 26 | 29 | |
| 30 | + /** |
|
| 31 | + * @return Collection |
|
| 32 | + */ |
|
| 27 | 33 | abstract protected function getByeGroup($fighters); |
| 28 | 34 | |
| 29 | 35 | abstract protected function getNumRounds($fightersCount); |
@@ -61,7 +67,7 @@ discard block |
||
| 61 | 67 | /** |
| 62 | 68 | * Get the biggest entity group. |
| 63 | 69 | * |
| 64 | - * @param $userGroups |
|
| 70 | + * @param Collection $userGroups |
|
| 65 | 71 | * |
| 66 | 72 | * @return int |
| 67 | 73 | */ |
@@ -130,7 +136,7 @@ discard block |
||
| 130 | 136 | /** |
| 131 | 137 | * Repart BYE in the tree,. |
| 132 | 138 | * |
| 133 | - * @param $fighterGroups |
|
| 139 | + * @param Collection $fighterGroups |
|
| 134 | 140 | * @param int $max |
| 135 | 141 | * |
| 136 | 142 | * @return Collection |
@@ -288,7 +294,7 @@ discard block |
||
| 288 | 294 | /** |
| 289 | 295 | * Attach a parent to every child for nestedSet Navigation. |
| 290 | 296 | * |
| 291 | - * @param $numFightersElim |
|
| 297 | + * @param integer $numFightersElim |
|
| 292 | 298 | */ |
| 293 | 299 | protected function addParentToChildren($numFightersElim) |
| 294 | 300 | { |
@@ -312,8 +318,8 @@ discard block |
||
| 312 | 318 | |
| 313 | 319 | /** |
| 314 | 320 | * @param Collection $fighters |
| 315 | - * @param $frequency |
|
| 316 | - * @param $sizeGroupBy |
|
| 321 | + * @param integer $frequency |
|
| 322 | + * @param integer $sizeGroupBy |
|
| 317 | 323 | * @param $bye |
| 318 | 324 | * |
| 319 | 325 | * @return Collection |
@@ -338,8 +344,8 @@ discard block |
||
| 338 | 344 | /** |
| 339 | 345 | * @param $frequency |
| 340 | 346 | * @param $sizeGroupBy |
| 341 | - * @param $count |
|
| 342 | - * @param $byeCount |
|
| 347 | + * @param integer $count |
|
| 348 | + * @param integer $byeCount |
|
| 343 | 349 | * |
| 344 | 350 | * @return bool |
| 345 | 351 | */ |
@@ -81,10 +81,10 @@ |
||
| 81 | 81 | { |
| 82 | 82 | if ($isTeam) { |
| 83 | 83 | $championship = Championship::find(2); |
| 84 | - factory(Team::class, (int) $numFighters)->create(['championship_id' => $championship->id]); |
|
| 84 | + factory(Team::class, (int)$numFighters)->create(['championship_id' => $championship->id]); |
|
| 85 | 85 | } else { |
| 86 | 86 | $championship = Championship::find(1); |
| 87 | - $users = factory(User::class, (int) $numFighters)->create(); |
|
| 87 | + $users = factory(User::class, (int)$numFighters)->create(); |
|
| 88 | 88 | foreach ($users as $user) { |
| 89 | 89 | factory(Competitor::class)->create( |
| 90 | 90 | ['championship_id' => $championship->id, |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * |
| 38 | 38 | * @param Request $request |
| 39 | 39 | * |
| 40 | - * @return \Illuminate\Http\Response|string |
|
| 40 | + * @return \Illuminate\Http\RedirectResponse |
|
| 41 | 41 | */ |
| 42 | 42 | public function store(Request $request, $championshipId) |
| 43 | 43 | { |
@@ -137,6 +137,9 @@ discard block |
||
| 137 | 137 | return back(); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | + /** |
|
| 141 | + * @param integer $numFighter |
|
| 142 | + */ |
|
| 140 | 143 | public function getWinnerId($fighters, $scores, $numFighter) |
| 141 | 144 | { |
| 142 | 145 | return $scores[$numFighter] != null ? $fighters[$numFighter] : null; |