@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | public function getFullNameAttribute() |
| 28 | 28 | { |
| 29 | - if ($this instanceof Competitor){ |
|
| 29 | + if ($this instanceof Competitor) { |
|
| 30 | 30 | return $this->getFullName(); |
| 31 | 31 | } |
| 32 | 32 | return $this->name; |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use Xoco70\KendoTournaments\Models\Team; |
| 4 | -$factory->define(Team::class, function (Faker\Generator $faker) { |
|
| 4 | +$factory->define(Team::class, function(Faker\Generator $faker) { |
|
| 5 | 5 | |
| 6 | 6 | return [ |
| 7 | 7 | 'name' => $faker->name, |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('users', function (Blueprint $table) { |
|
| 15 | + Schema::create('users', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('firstname'); |
@@ -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 | public function __construct(Fight $fight = null) |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | { |
| 10 | 10 | public function __construct(Fight $fight = null) |
| 11 | 11 | { |
| 12 | - if ($fight!=null){ |
|
| 13 | - $this->id= $fight->id; |
|
| 14 | - $this->short_id= $fight->short_id; |
|
| 15 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
| 16 | - $this->c1= $fight->c1; |
|
| 17 | - $this->c2= $fight->c2; |
|
| 12 | + if ($fight != null) { |
|
| 13 | + $this->id = $fight->id; |
|
| 14 | + $this->short_id = $fight->short_id; |
|
| 15 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
| 16 | + $this->c1 = $fight->c1; |
|
| 17 | + $this->c2 = $fight->c2; |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | /** |
@@ -9,12 +9,12 @@ |
||
| 9 | 9 | |
| 10 | 10 | public function __construct(Fight $fight = null) |
| 11 | 11 | { |
| 12 | - if ($fight!=null){ |
|
| 13 | - $this->id= $fight->id; |
|
| 14 | - $this->short_id= $fight->short_id; |
|
| 15 | - $this->fighters_group_id= $fight->fighters_group_id; |
|
| 16 | - $this->c1= $fight->c1; |
|
| 17 | - $this->c2= $fight->c2; |
|
| 12 | + if ($fight != null) { |
|
| 13 | + $this->id = $fight->id; |
|
| 14 | + $this->short_id = $fight->short_id; |
|
| 15 | + $this->fighters_group_id = $fight->fighters_group_id; |
|
| 16 | + $this->c1 = $fight->c1; |
|
| 17 | + $this->c2 = $fight->c2; |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | |
@@ -180,7 +180,7 @@ |
||
| 180 | 180 | public function hasDeterminedParent() |
| 181 | 181 | { |
| 182 | 182 | // There is more than 1 fight, should be Preliminary |
| 183 | - if (sizeof($this->fighters()) > 1){ |
|
| 183 | + if (sizeof($this->fighters()) > 1) { |
|
| 184 | 184 | return false; |
| 185 | 185 | } |
| 186 | 186 | foreach ($this->children as $child) { |
@@ -184,7 +184,9 @@ |
||
| 184 | 184 | return false; |
| 185 | 185 | } |
| 186 | 186 | foreach ($this->children as $child) { |
| 187 | - if (sizeof($child->fighters()) > 1) return false; |
|
| 187 | + if (sizeof($child->fighters()) > 1) { |
|
| 188 | + return false; |
|
| 189 | + } |
|
| 188 | 190 | } |
| 189 | 191 | return true; |
| 190 | 192 | |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Illuminate\Support\Facades\App; |
| 7 | 7 | use Xoco70\KendoTournaments\Models\Championship; |
| 8 | 8 | use Xoco70\KendoTournaments\Models\DirectEliminationFight; |
| 9 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 10 | 9 | |
| 11 | 10 | abstract class DirectEliminationTreeGen extends TreeGen |
| 12 | 11 | { |
@@ -15,7 +15,6 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * Calculate the Byes need to fill the Championship Tree. |
| 18 | - * @param Championship $championship |
|
| 19 | 18 | * @param $fighters |
| 20 | 19 | * @return Collection |
| 21 | 20 | */ |
@@ -65,7 +64,7 @@ discard block |
||
| 65 | 64 | * Chunk Fighters into groups for fighting, and optionnaly shuffle |
| 66 | 65 | * @param $round |
| 67 | 66 | * @param $fightersByEntity |
| 68 | - * @return mixed |
|
| 67 | + * @return Collection |
|
| 69 | 68 | */ |
| 70 | 69 | protected function chunkAndShuffle($round, Collection $fightersByEntity) |
| 71 | 70 | { |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Illuminate\Support\Facades\App; |
| 7 | 7 | use Xoco70\KendoTournaments\Models\Championship; |
| 8 | 8 | use Xoco70\KendoTournaments\Models\DirectEliminationFight; |
| 9 | -use Xoco70\KendoTournaments\Models\Fight; |
|
| 10 | 9 | use Xoco70\KendoTournaments\Models\PreliminaryFight; |
| 11 | 10 | |
| 12 | 11 | abstract class PlayOffTreeGen extends TreeGen |
@@ -26,7 +26,7 @@ |
||
| 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); |