@@ -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 | } |
@@ -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); |
@@ -4,10 +4,10 @@ |
||
4 | 4 | use Xoco70\LaravelTournaments\Models\Championship; |
5 | 5 | use Xoco70\LaravelTournaments\Models\ChampionshipSettings; |
6 | 6 | |
7 | -$factory->define(ChampionshipSettings::class, function (Faker\Generator $faker) use ($factory) { |
|
7 | +$factory->define(ChampionshipSettings::class, function(Faker\Generator $faker) use ($factory) { |
|
8 | 8 | $tcs = Championship::all()->pluck('id')->toArray(); |
9 | 9 | |
10 | - $fightingAreas = [1,2,4,8]; |
|
10 | + $fightingAreas = [1, 2, 4, 8]; |
|
11 | 11 | return [ |
12 | 12 | 'championship_id' => $faker->randomElement($tcs), |
13 | 13 | 'treeType' => $faker->numberBetween(0, 1), |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $this->groupsByRound = $groupsByRound; |
27 | 27 | $this->hasPreliminary = $hasPreliminary; |
28 | 28 | |
29 | - $this->firstRoundName = $groupsByRound->first()->map(function ($item) use ($championship) { |
|
29 | + $this->firstRoundName = $groupsByRound->first()->map(function($item) use ($championship) { |
|
30 | 30 | $fighters = $item->getFightersWithBye(); |
31 | 31 | $fighter1 = $fighters->get(0); |
32 | 32 | $fighter2 = $fighters->get(1); |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | $prefix = "singleElimination"; |
3 | -if ($championship->hasPreliminary() && $roundNumber ==1){ |
|
3 | +if ($championship->hasPreliminary() && $roundNumber == 1) { |
|
4 | 4 | $prefix = "preliminary"; |
5 | 5 | } |
6 | -$className = $prefix."_select"; |
|
7 | -$selectName = $prefix."_fighters[]"; |
|
6 | +$className = $prefix . "_select"; |
|
7 | +$selectName = $prefix . "_fighters[]"; |
|
8 | 8 | |
9 | 9 | ?> |
10 | 10 | <!-- r = round, m = match, f = fighter --> |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | abstract protected function createByeFighter(); |
25 | 25 | |
26 | - abstract protected function addFighterToGroup(FightersGroup $group, $fighter,$fighterToUpdate); |
|
26 | + abstract protected function addFighterToGroup(FightersGroup $group, $fighter, $fighterToUpdate); |
|
27 | 27 | |
28 | 28 | abstract protected function getByeGroup($fighters); |
29 | 29 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | private function getMaxFightersByEntity($userGroups): int |
76 | 76 | { |
77 | 77 | return $userGroups |
78 | - ->sortByDesc(function ($group) { |
|
78 | + ->sortByDesc(function($group) { |
|
79 | 79 | return $group->count(); |
80 | 80 | }) |
81 | 81 | ->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 |
@@ -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 | /** |