@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('users', function (Blueprint $table) { |
|
15 | + Schema::create('users', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('name'); |
18 | 18 | $table->string('email')->unique(); |
@@ -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); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::table('users', function ($table) { |
|
16 | + Schema::table('users', function($table) { |
|
17 | 17 | $table->string('firstname')->default('firstname'); |
18 | 18 | $table->string('lastname')->default('lastname'); |
19 | 19 | }); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | { |
29 | 29 | DBHelpers::setFKCheckOff(); |
30 | 30 | if (Schema::hasColumn('users', 'firstname')) { |
31 | - Schema::table('users', function (Blueprint $table) { |
|
31 | + Schema::table('users', function(Blueprint $table) { |
|
32 | 32 | $table->dropColumn('firstname'); |
33 | 33 | }); |
34 | 34 | } |
35 | 35 | if (Schema::hasColumn('users', 'lastname')) { |
36 | - Schema::table('users', function (Blueprint $table) { |
|
36 | + Schema::table('users', function(Blueprint $table) { |
|
37 | 37 | $table->dropColumn('lastname'); |
38 | 38 | }); |
39 | 39 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function getFullName() //TODO Should remove get prefix |
43 | 43 | { |
44 | - return $this->defaultName() ?? $this->user->firstname.' '.$this->user->lastname; |
|
44 | + return $this->defaultName() ?? $this->user->firstname . ' ' . $this->user->lastname; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | { |
29 | 29 | parent::boot(); |
30 | 30 | |
31 | - static::deleting(function ($championship) { |
|
31 | + static::deleting(function($championship) { |
|
32 | 32 | $championship->competitors()->delete(); |
33 | 33 | $championship->settings()->delete(); |
34 | 34 | }); |
35 | - static::restoring(function ($championship) { |
|
35 | + static::restoring(function($championship) { |
|
36 | 36 | $championship->competitors()->restore(); |
37 | 37 | $championship->settings()->restore(); |
38 | 38 | }); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $ageCategoryText = $this->category->getAgeString(); |
196 | 196 | $gradeText = $this->category->getGradeString(); |
197 | 197 | |
198 | - return $teamText.' '.$genders[$this->category->gender].' '.$ageCategoryText.' '.$gradeText; |
|
198 | + return $teamText . ' ' . $genders[$this->category->gender] . ' ' . $ageCategoryText . ' ' . $gradeText; |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | public function getSettings() |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | private function getMaxFightersByEntity($userGroups): int |
77 | 77 | { |
78 | 78 | return $userGroups |
79 | - ->sortByDesc(function ($group) { |
|
79 | + ->sortByDesc(function($group) { |
|
80 | 80 | return $group->count(); |
81 | 81 | }) |
82 | 82 | ->first() |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | protected function getTreeSize($fighterCount, $groupSize) |
115 | 115 | { |
116 | 116 | $squareMultiplied = collect([1, 2, 4, 8, 16, 32, 64]) |
117 | - ->map(function ($item) use ($groupSize) { |
|
117 | + ->map(function($item) use ($groupSize) { |
|
118 | 118 | return $item * $groupSize; |
119 | 119 | }); // [4, 8, 16, 32, 64,...] |
120 | 120 |
@@ -34,8 +34,14 @@ discard block |
||
34 | 34 | |
35 | 35 | abstract protected function generateGroupsForRound(Collection $fightersByArea, $round); |
36 | 36 | |
37 | + /** |
|
38 | + * @return Collection |
|
39 | + */ |
|
37 | 40 | abstract protected function getByeGroup($fighters); |
38 | 41 | |
42 | + /** |
|
43 | + * @param integer $fighterId |
|
44 | + */ |
|
39 | 45 | abstract protected function getFighter($fighterId); |
40 | 46 | |
41 | 47 | abstract protected function getFighters(); |
@@ -114,7 +120,7 @@ discard block |
||
114 | 120 | /** |
115 | 121 | * Get the biggest entity group. |
116 | 122 | * |
117 | - * @param $userGroups |
|
123 | + * @param Collection $userGroups |
|
118 | 124 | * |
119 | 125 | * @return int |
120 | 126 | */ |
@@ -182,7 +188,7 @@ discard block |
||
182 | 188 | /** |
183 | 189 | * Repart BYE in the tree,. |
184 | 190 | * |
185 | - * @param $fighterGroups |
|
191 | + * @param Collection $fighterGroups |
|
186 | 192 | * @param int $max |
187 | 193 | * |
188 | 194 | * @return Collection |
@@ -342,7 +348,7 @@ discard block |
||
342 | 348 | /** |
343 | 349 | * Attach a parent to every child for nestedSet Navigation. |
344 | 350 | * |
345 | - * @param $numFightersElim |
|
351 | + * @param integer $numFightersElim |
|
346 | 352 | */ |
347 | 353 | protected function addParentToChildren($numFightersElim) |
348 | 354 | { |
@@ -366,8 +372,8 @@ discard block |
||
366 | 372 | |
367 | 373 | /** |
368 | 374 | * @param Collection $fighters |
369 | - * @param $frequency |
|
370 | - * @param $sizeGroupBy |
|
375 | + * @param integer $frequency |
|
376 | + * @param integer $sizeGroupBy |
|
371 | 377 | * @param $bye |
372 | 378 | * |
373 | 379 | * @return Collection |
@@ -392,8 +398,8 @@ discard block |
||
392 | 398 | /** |
393 | 399 | * @param $frequency |
394 | 400 | * @param $sizeGroupBy |
395 | - * @param $count |
|
396 | - * @param $byeCount |
|
401 | + * @param integer $count |
|
402 | + * @param integer $byeCount |
|
397 | 403 | * |
398 | 404 | * @return bool |
399 | 405 | */ |
@@ -511,7 +517,7 @@ discard block |
||
511 | 517 | |
512 | 518 | /** |
513 | 519 | * @param $fighters |
514 | - * @param $numFighter |
|
520 | + * @param integer $numFighter |
|
515 | 521 | * @param $fight |
516 | 522 | * @param $winners |
517 | 523 | * @return int |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use Illuminate\Http\Request; |
8 | 8 | use Illuminate\Support\Facades\DB; |
9 | 9 | use Xoco70\LaravelTournaments\Contracts\TreeGenerable; |
10 | -use Xoco70\LaravelTournaments\Exceptions\DuplicatedException; |
|
11 | 10 | use Xoco70\LaravelTournaments\Exceptions\DuplicatedFighterException; |
12 | 11 | use Xoco70\LaravelTournaments\Exceptions\TreeGenerationException; |
13 | 12 | use Xoco70\LaravelTournaments\Models\Championship; |
@@ -16,18 +16,18 @@ |
||
16 | 16 | */ |
17 | 17 | public function boot(Router $router) |
18 | 18 | { |
19 | - $viewPath = __DIR__.'/../resources/views'; |
|
19 | + $viewPath = __DIR__ . '/../resources/views'; |
|
20 | 20 | $this->loadViewsFrom($viewPath, 'laravel-tournaments'); |
21 | 21 | |
22 | - $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
|
23 | - $this->loadTranslationsFrom(__DIR__.'/../translations', 'laravel-tournaments'); |
|
22 | + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); |
|
23 | + $this->loadTranslationsFrom(__DIR__ . '/../translations', 'laravel-tournaments'); |
|
24 | 24 | |
25 | - $this->publishes([__DIR__.'/../database/migrations' => $this->app->databasePath().'/migrations'], 'laravel-tournaments'); |
|
26 | - $this->publishes([__DIR__.'/../database/seeds' => $this->app->databasePath().'/seeds'], 'laravel-tournaments'); |
|
27 | - $this->publishes([__DIR__.'/../database/factories' => $this->app->databasePath().'/factories'], 'laravel-tournaments'); |
|
28 | - $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
25 | + $this->publishes([__DIR__ . '/../database/migrations' => $this->app->databasePath() . '/migrations'], 'laravel-tournaments'); |
|
26 | + $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'laravel-tournaments'); |
|
27 | + $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'laravel-tournaments'); |
|
28 | + $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
29 | 29 | |
30 | - $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function ($router) { |
|
30 | + $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function($router) { |
|
31 | 31 | $router->get('/', 'Xoco70\LaravelTournaments\TreeController@index')->name('tree.index'); |
32 | 32 | $router->post('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@store')->name('tree.store'); |
33 | 33 | $router->put('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@update')->name('tree.update'); |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound-1)-1) * 51); |
|
2 | +$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound - 1) - 1) * 51); |
|
3 | 3 | $top = \App\Bracket::getTopFight($numRound, $numFight) + $topOffset; |
4 | 4 | |
5 | 5 | $left = \App\Bracket::getLeftFight($numRound); |