@@ -14,7 +14,7 @@ |
||
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | if (!Schema::hasTable('sessions')) { |
17 | - Schema::create('sessions', function (Blueprint $table) { |
|
17 | + Schema::create('sessions', function(Blueprint $table) { |
|
18 | 18 | $table->string('id')->unique(); |
19 | 19 | $table->integer('user_id')->nullable(); |
20 | 20 | $table->string('ip_address', 45)->nullable(); |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Xoco70\LaravelTournaments\Models\Championship; |
4 | 4 | use Xoco70\LaravelTournaments\Models\Competitor; |
5 | 5 | |
6 | -$factory->define(Competitor::class, function (Faker\Generator $faker) { |
|
6 | +$factory->define(Competitor::class, function(Faker\Generator $faker) { |
|
7 | 7 | $tcs = Championship::all()->pluck('id')->toArray(); |
8 | 8 | $users = \Illuminate\Foundation\Auth\User::all()->pluck('id')->toArray(); |
9 | 9 | $championshipId = $faker->randomElement($tcs); |
@@ -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 | |
9 | 9 | $dateIni = $faker->dateTimeBetween('now', '+2 weeks')->format('Y-m-d'); |
10 | 10 | $venues = Venue::all()->pluck('id')->toArray(); |
@@ -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 | return [ |
6 | 6 | 'name' => $faker->name, |
7 | 7 | 'email' => $faker->unique()->safeEmail, |
@@ -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/seeds' => $this->app->databasePath().'/seeds'], 'laravel-tournaments'); |
|
26 | - $this->publishes([__DIR__.'/../database/factories' => $this->app->databasePath().'/factories'], 'laravel-tournaments'); |
|
27 | - $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
28 | - $this->publishes([__DIR__.'/../config/laravel-tournaments.php' => config_path('laravel-tournaments.php')], 'laravel-tournaments'); |
|
25 | + $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'laravel-tournaments'); |
|
26 | + $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'laravel-tournaments'); |
|
27 | + $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/laravel-tournaments')], 'laravel-tournaments'); |
|
28 | + $this->publishes([__DIR__ . '/../config/laravel-tournaments.php' => config_path('laravel-tournaments.php')], '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'); |
@@ -31,6 +31,9 @@ |
||
31 | 31 | return $this->name; |
32 | 32 | } |
33 | 33 | |
34 | + /** |
|
35 | + * @param string $attr |
|
36 | + */ |
|
34 | 37 | public function hasAttribute($attr) |
35 | 38 | { |
36 | 39 | return array_key_exists($attr, $this->attributes); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | if (!Schema::hasTable('users')) { |
17 | - Schema::create('users', function (Blueprint $table) { |
|
17 | + Schema::create('users', function(Blueprint $table) { |
|
18 | 18 | $table->increments('id'); |
19 | 19 | $table->string('name'); |
20 | 20 | $table->string('firstname')->default('firstname'); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $table->timestamps(); |
25 | 25 | }); |
26 | 26 | } else { |
27 | - Schema::table('users', function (Blueprint $table) { |
|
27 | + Schema::table('users', function(Blueprint $table) { |
|
28 | 28 | if (!Schema::hasColumn('users', 'name')) { |
29 | 29 | $table->string('name')->default('name'); |
30 | 30 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $table->string('lastname')->default('lastname'); |
36 | 36 | } |
37 | 37 | if (!Schema::hasColumn('users', 'email')) { |
38 | - $table->string('email')->default('user_'.rand(100000, 999999).'@kendozone.com')->unique(); |
|
38 | + $table->string('email')->default('user_' . rand(100000, 999999) . '@kendozone.com')->unique(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | if (!Schema::hasColumn('users', 'password')) { |
@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * Save a Fight. |
60 | 60 | * |
61 | - * @param Collection $group |
|
61 | + * @param FightersGroup $group |
|
62 | 62 | * @param int $numGroup |
63 | 63 | * @param int $order |
64 | 64 | */ |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param $fightersByEntity |
31 | 31 | * |
32 | - * @return mixed |
|
32 | + * @return Collection |
|
33 | 33 | */ |
34 | 34 | protected function chunk(Collection $fightersByEntity) |
35 | 35 | { |
@@ -103,6 +103,9 @@ discard block |
||
103 | 103 | $this->generateGroupsForRound($fighters, 1); |
104 | 104 | } |
105 | 105 | |
106 | + /** |
|
107 | + * @param integer $round |
|
108 | + */ |
|
106 | 109 | protected function generateGroupsForRound(Collection $fightersByArea, $round) |
107 | 110 | { |
108 | 111 | $fightersId = $fightersByArea->pluck('id'); |