@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create('fight', function (Blueprint $table) { |
|
16 | + Schema::create('fight', function(Blueprint $table) { |
|
17 | 17 | $table->increments('id'); |
18 | 18 | $table->integer('short_id')->unsigned()->nullable(); |
19 | 19 | $table->integer('fighters_group_id')->unsigned()->index(); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('category', function (Blueprint $table) { |
|
15 | + Schema::create('category', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('name'); |
18 | 18 | $table->string('gender')->nullable(); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $table->engine = 'InnoDB'; |
29 | 29 | }); |
30 | 30 | |
31 | - Schema::create('championship', function (Blueprint $table) { |
|
31 | + Schema::create('championship', function(Blueprint $table) { |
|
32 | 32 | $table->increments('id'); |
33 | 33 | $table->integer('tournament_id')->unsigned()->index(); |
34 | 34 | $table->integer('category_id')->unsigned()->index(); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $table->engine = 'InnoDB'; |
51 | 51 | }); |
52 | 52 | |
53 | - Schema::create('competitor', function (Blueprint $table) { |
|
53 | + Schema::create('competitor', function(Blueprint $table) { |
|
54 | 54 | $table->increments('id'); |
55 | 55 | $table->integer('short_id')->unsigned()->nullable(); |
56 | 56 | $table->integer('championship_id')->unsigned()->index(); |
@@ -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(); |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | - $settings = $championship->getSettings(); |
|
2 | + $settings = $championship->getSettings(); |
|
3 | 3 | ?> |
4 | 4 | <div align="center"> |
5 | 5 | @if (Request::is('championships/'.$championship->id.'/pdf')) |
@@ -69,8 +69,12 @@ |
||
69 | 69 | */ |
70 | 70 | private function defaultName() |
71 | 71 | { |
72 | - if ($this == null) return "BYE"; |
|
73 | - if ($this->user == null) return "BYE"; |
|
72 | + if ($this == null) { |
|
73 | + return "BYE"; |
|
74 | + } |
|
75 | + if ($this->user == null) { |
|
76 | + return "BYE"; |
|
77 | + } |
|
74 | 78 | return null; |
75 | 79 | } |
76 | 80 |
@@ -70,7 +70,7 @@ |
||
70 | 70 | ] |
71 | 71 | ); |
72 | 72 | } |
73 | - $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
73 | + $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
74 | 74 | $generation = $championship->chooseGenerationStrategy(); |
75 | 75 | |
76 | 76 | try { |
@@ -203,7 +203,9 @@ |
||
203 | 203 | $fightsByRound = $championship->fightsByRound($numRound)->with('group.parent')->get(); |
204 | 204 | foreach ($fightsByRound as $fight) { |
205 | 205 | $parentGroup = $fight->group->parent; |
206 | - if ($parentGroup == null) break; |
|
206 | + if ($parentGroup == null) { |
|
207 | + break; |
|
208 | + } |
|
207 | 209 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
208 | 210 | |
209 | 211 | // IN this $fight, is c1 or c2 has the info? |
@@ -47,7 +47,7 @@ |
||
47 | 47 | { |
48 | 48 | if ($this->championship->hasPreliminary()) { |
49 | 49 | $fightersGroup = $fightersByEntity->chunk($this->settings->preliminaryGroupSize); |
50 | - if (!App::runningUnitTests()){ |
|
50 | + if (!App::runningUnitTests()) { |
|
51 | 51 | $fightersGroup = $fightersGroup->shuffle(); |
52 | 52 | } |
53 | 53 | } else { // Round Robin |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | /** |
50 | 50 | * Get the biggest entity group |
51 | - * @param $userGroups |
|
51 | + * @param Collection $userGroups |
|
52 | 52 | * |
53 | 53 | * @return int |
54 | 54 | */ |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | /** |
107 | 107 | * Repart BYE in the tree, |
108 | - * @param $fighterGroups |
|
108 | + * @param Collection $fighterGroups |
|
109 | 109 | * @param int $max |
110 | 110 | * |
111 | 111 | * @return Collection |
@@ -163,7 +163,6 @@ discard block |
||
163 | 163 | * @param Collection $usersByArea |
164 | 164 | * @param integer $area |
165 | 165 | * @param integer $round |
166 | - * @param integer $shuffle |
|
167 | 166 | * |
168 | 167 | */ |
169 | 168 | public function generateGroupsForRound($usersByArea, $area, $round) |
@@ -186,9 +185,9 @@ discard block |
||
186 | 185 | } |
187 | 186 | |
188 | 187 | /** |
189 | - * @param $area |
|
190 | - * @param $order |
|
191 | - * @param $round |
|
188 | + * @param integer $area |
|
189 | + * @param integer $order |
|
190 | + * @param integer $round |
|
192 | 191 | * @param $parent |
193 | 192 | * @return FightersGroup |
194 | 193 | */ |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | private function getMaxFightersByEntity($userGroups): int |
56 | 56 | { |
57 | 57 | return $userGroups |
58 | - ->sortByDesc(function ($group) { |
|
58 | + ->sortByDesc(function($group) { |
|
59 | 59 | return $group->count(); |
60 | 60 | }) |
61 | 61 | ->first() |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | protected function getTreeSize($fighterCount, $groupSize) |
92 | 92 | { |
93 | 93 | $square = collect([1, 2, 4, 8, 16, 32, 64]); |
94 | - $squareMultiplied = $square->map(function ($item) use ($groupSize) { |
|
94 | + $squareMultiplied = $square->map(function($item) use ($groupSize) { |
|
95 | 95 | return $item * $groupSize; |
96 | 96 | }); |
97 | 97 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $order = 1; |
175 | 175 | foreach ($fightersGroup as $fighters) { |
176 | 176 | $fighters = $fighters->pluck('id'); |
177 | - if (!App::runningUnitTests()){ |
|
177 | + if (!App::runningUnitTests()) { |
|
178 | 178 | $fighters = $fighters->shuffle(); |
179 | 179 | } |
180 | 180 | $group = $this->saveGroup($area, $order, $round, null); |