@@ -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(); |
@@ -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 |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Faker\Factory as Faker; |
|
4 | 3 | use Illuminate\Database\Seeder; |
5 | 4 | use Illuminate\Foundation\Auth\User; |
6 | 5 | use Xoco70\KendoTournaments\Models\Championship; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | ); |
64 | 64 | } |
65 | 65 | |
66 | - $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
66 | + $championship->settings = ChampionshipSettings::createOrUpdate($request, $championship); |
|
67 | 67 | $generation = $championship->chooseGenerationStrategy(); |
68 | 68 | |
69 | 69 | try { |
@@ -49,7 +49,9 @@ |
||
49 | 49 | { |
50 | 50 | foreach ($fightsByRound as $fight) { |
51 | 51 | $parentGroup = $fight->group->parent; |
52 | - if ($parentGroup == null) break; |
|
52 | + if ($parentGroup == null) { |
|
53 | + break; |
|
54 | + } |
|
53 | 55 | $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary |
54 | 56 | |
55 | 57 | // IN this $fight, is c1 or c2 has the info? |
@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Xoco70\KendoTournaments\Models; |
4 | 4 | |
5 | -use Illuminate\Database\Eloquent\Model; |
|
6 | -use Illuminate\Support\Collection; |
|
7 | - |
|
8 | 5 | class DirectEliminationFight extends Fight |
9 | 6 | { |
10 | 7 |
@@ -46,7 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected static function getActorsToFights(FightersGroup $group) |
48 | 48 | { |
49 | - if ($group == null) return null; |
|
49 | + if ($group == null) { |
|
50 | + return null; |
|
51 | + } |
|
50 | 52 | $fighters = $group->getFighters(); |
51 | 53 | $fighterType = $group->getFighterType(); |
52 | 54 | if (sizeof($fighters) == 0) { |
@@ -186,18 +188,26 @@ discard block |
||
186 | 188 | */ |
187 | 189 | public function hasDeterminedParent() |
188 | 190 | { |
189 | - if ($this->has2Fighters()) return true; |
|
191 | + if ($this->has2Fighters()) { |
|
192 | + return true; |
|
193 | + } |
|
190 | 194 | foreach ($this->group->children as $child) { |
191 | 195 | $fight = $child->fights->get(0); |
192 | - if ($fight->has2Fighters()) return false; |
|
196 | + if ($fight->has2Fighters()) { |
|
197 | + return false; |
|
198 | + } |
|
193 | 199 | } |
194 | 200 | return true; |
195 | 201 | } |
196 | 202 | |
197 | 203 | public function shouldBeInFightList() |
198 | 204 | { |
199 | - if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false; |
|
200 | - if ($this->has2Fighters()) return true; |
|
205 | + if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) { |
|
206 | + return false; |
|
207 | + } |
|
208 | + if ($this->has2Fighters()) { |
|
209 | + return true; |
|
210 | + } |
|
201 | 211 | // We aint in the first round, and there is 1 or 0 competitor |
202 | 212 | // We check children, and see : |
203 | 213 | // if there is 2 - 2 fighters -> undetermine, we cannot add it to fight list |
@@ -223,7 +233,9 @@ discard block |
||
223 | 233 | private function belongsToFirstRound() |
224 | 234 | { |
225 | 235 | $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray(); |
226 | - if (in_array($this->id, $firstRoundFights)) return true; |
|
236 | + if (in_array($this->id, $firstRoundFights)) { |
|
237 | + return true; |
|
238 | + } |
|
227 | 239 | return false; |
228 | 240 | } |
229 | 241 |