@@ -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), |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Create empty groups for direct Elimination Tree. |
52 | 52 | * |
53 | - * @param $numFighters |
|
53 | + * @param integer $numFighters |
|
54 | 54 | */ |
55 | 55 | protected function pushEmptyGroupsToTree($numFighters) |
56 | 56 | { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | /** |
149 | 149 | * @param Collection $usersByArea |
150 | - * @param $round |
|
150 | + * @param integer $round |
|
151 | 151 | */ |
152 | 152 | public function generateGroupsForRound(Collection $usersByArea, $round) |
153 | 153 | { |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @param $fightersByEntity |
44 | 44 | * |
45 | - * @return mixed |
|
45 | + * @return Collection |
|
46 | 46 | */ |
47 | 47 | protected function chunkAndShuffle(Collection $fightersByEntity) |
48 | 48 | { |
@@ -108,6 +108,9 @@ discard block |
||
108 | 108 | |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param integer $round |
|
113 | + */ |
|
111 | 114 | protected function generateGroupsForRound(Collection $fightersByArea, $round) |
112 | 115 | { |
113 | 116 | $fightersId = $fightersByArea->pluck('id'); |