@@ -112,15 +112,15 @@ |
||
112 | 112 | { |
113 | 113 | $isTeam = $this->group->championship->category->isTeam; |
114 | 114 | if ($isTeam) { |
115 | - $teamToUpdate = 'team'.$numFighter; |
|
115 | + $teamToUpdate = 'team' . $numFighter; |
|
116 | 116 | |
117 | 117 | return optional($this->$teamToUpdate)->$attr; |
118 | 118 | } |
119 | - $competitorToUpdate = 'competitor'.$numFighter; |
|
119 | + $competitorToUpdate = 'competitor' . $numFighter; |
|
120 | 120 | if ($attr == 'name') { |
121 | 121 | return $this->$competitorToUpdate == null |
122 | 122 | ? '' |
123 | - : $this->$competitorToUpdate->user->firstname.' '.$this->$competitorToUpdate->user->lastname; |
|
123 | + : $this->$competitorToUpdate->user->firstname . ' ' . $this->$competitorToUpdate->user->lastname; |
|
124 | 124 | } elseif ($attr == 'short_id') { |
125 | 125 | return optional($this->$competitorToUpdate)->short_id; |
126 | 126 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | - * @param FightersGroup|null $group |
|
44 | + * @param FightersGroup $group |
|
45 | 45 | * |
46 | 46 | * @return Collection |
47 | 47 | */ |
@@ -151,6 +151,7 @@ discard block |
||
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
154 | + * @param boolean $default |
|
154 | 155 | * @return bool |
155 | 156 | */ |
156 | 157 | public function shouldBeInFightList($default) |
@@ -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() |
@@ -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 chunkAndShuffle(Collection $fightersByEntity) |
35 | 35 | { |
@@ -104,6 +104,9 @@ discard block |
||
104 | 104 | $this->generateGroupsForRound($fighters, 1); |
105 | 105 | } |
106 | 106 | |
107 | + /** |
|
108 | + * @param integer $round |
|
109 | + */ |
|
107 | 110 | protected function generateGroupsForRound(Collection $fightersByArea, $round) |
108 | 111 | { |
109 | 112 | $fightersId = $fightersByArea->pluck('id'); |
@@ -57,13 +57,13 @@ |
||
57 | 57 | protected static function boot() |
58 | 58 | { |
59 | 59 | parent::boot(); |
60 | - static::deleting(function ($tournament) { |
|
60 | + static::deleting(function($tournament) { |
|
61 | 61 | foreach ($tournament->championships as $ct) { |
62 | 62 | $ct->delete(); |
63 | 63 | } |
64 | 64 | // $tournament->invites()->delete(); |
65 | 65 | }); |
66 | - static::restoring(function ($tournament) { |
|
66 | + static::restoring(function($tournament) { |
|
67 | 67 | foreach ($tournament->championships()->withTrashed()->get() as $ct) { |
68 | 68 | $ct->restore(); |
69 | 69 | } |
@@ -7,7 +7,7 @@ |
||
7 | 7 | { |
8 | 8 | public function up() |
9 | 9 | { |
10 | - Schema::create('team', function (Blueprint $table) { |
|
10 | + Schema::create('team', function(Blueprint $table) { |
|
11 | 11 | $table->increments('id'); |
12 | 12 | $table->integer('short_id')->unsigned()->nullable(); |
13 | 13 | $table->string('name'); |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('fighters_groups', function (Blueprint $table) { |
|
16 | + Schema::create('fighters_groups', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->tinyInteger('short_id')->unsigned()->nullable(); |
19 | 19 | $table->integer('championship_id')->unsigned()->index(); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function up() |
16 | 16 | { |
17 | 17 | if (!Schema::hasTable('fight')) { |
18 | - Schema::create('fight', function (Blueprint $table) { |
|
18 | + Schema::create('fight', function(Blueprint $table) { |
|
19 | 19 | $table->increments('id'); |
20 | 20 | $table->integer('short_id')->unsigned()->nullable(); |
21 | 21 | $table->integer('fighters_group_id')->unsigned()->index(); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('venue', function (Blueprint $table) { |
|
15 | + Schema::create('venue', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('venue_name'); |
18 | 18 | $table->string('address')->nullable(); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('championship_settings', function (Blueprint $table) { |
|
15 | + Schema::create('championship_settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('alias')->nullable(); |
18 | 18 | $table->integer('championship_id')->unsigned()->unique(); |