@@ -42,7 +42,7 @@ |
||
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 | { |
@@ -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 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $generation->run(); |
55 | 55 | } catch (TreeGenerationException $e) { |
56 | 56 | redirect()->back() |
57 | - ->withErrors([$numFighters.'-'.$e->getMessage()]); |
|
57 | + ->withErrors([$numFighters . '-' . $e->getMessage()]); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | return back() |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | { |
85 | 85 | if ($isTeam) { |
86 | 86 | $championship = Championship::find(2); |
87 | - factory(Team::class, (int) $numFighters)->create(['championship_id' => $championship->id]); |
|
87 | + factory(Team::class, (int)$numFighters)->create(['championship_id' => $championship->id]); |
|
88 | 88 | } else { |
89 | 89 | $championship = Championship::find(1); |
90 | - $users = factory(User::class, (int) $numFighters)->create(); |
|
90 | + $users = factory(User::class, (int)$numFighters)->create(); |
|
91 | 91 | foreach ($users as $user) { |
92 | 92 | factory(Competitor::class)->create( |
93 | 93 | ['championship_id' => $championship->id, |
@@ -26,7 +26,7 @@ discard block |
||
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); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | //The minus 3 is to ignore the final, semi final and quarter final rounds |
128 | 128 | |
129 | 129 | for ($i = 0; $i < $noRounds - 3; $i++) { |
130 | - $tempRounds[] = 'Last '.$noTeamsInFirstRound; |
|
130 | + $tempRounds[] = 'Last ' . $noTeamsInFirstRound; |
|
131 | 131 | $noTeamsInFirstRound /= 2; |
132 | 132 | } |
133 | 133 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | foreach ($roundTitles as $key => $roundTitle) { |
140 | 140 | $left = $key * ($this->matchWrapperWidth + $this->roundSpacing - 1); |
141 | 141 | |
142 | - echo '<div class="round-title" style="left: '.$left.'px;">'.$roundTitle.'</div>'; |
|
142 | + echo '<div class="round-title" style="left: ' . $left . 'px;">' . $roundTitle . '</div>'; |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | echo '</div>'; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | public function getPlayerList($selected) |
154 | 154 | { |
155 | 155 | $html = '<select> |
156 | - <option'.($selected == '' ? ' selected' : '').'></option>'; |
|
156 | + <option'.($selected == '' ? ' selected' : '') . '></option>'; |
|
157 | 157 | |
158 | 158 | foreach ($this->championship->fighters as $fighter) { |
159 | 159 | $html = $this->addOptionToSelect($selected, $fighter, $html); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | { |
208 | 208 | if ($fighter != null) { |
209 | 209 | $select = $selected != null && $selected->id == $fighter->id ? ' selected' : ''; |
210 | - $html .= '<option'.$select |
|
210 | + $html .= '<option' . $select |
|
211 | 211 | .' value=' |
212 | 212 | .($fighter->id ?? '') |
213 | 213 | .'>' |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | private function getMaxFightersByEntity($userGroups): int |
73 | 73 | { |
74 | 74 | return $userGroups |
75 | - ->sortByDesc(function ($group) { |
|
75 | + ->sortByDesc(function($group) { |
|
76 | 76 | return $group->count(); |
77 | 77 | }) |
78 | 78 | ->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 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $sizeGroupBy = count($byeGroup); |
172 | 172 | |
173 | 173 | $frequency = $sizeGroupBy != 0 |
174 | - ? (int) floor($sizeFighters / $sizeGroupBy) |
|
174 | + ? (int)floor($sizeFighters / $sizeGroupBy) |
|
175 | 175 | : -1; |
176 | 176 | |
177 | 177 | // Create Copy of $competitors |
@@ -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() |