@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('round_team', function (Blueprint $table) { |
|
| 16 | + Schema::create('round_team', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('team_id')->unsigned()->nullable()->index(); |
| 19 | 19 | $table->integer('round_id')->unsigned()->index(); // A checar |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | // Delete previous fight for this championship |
| 72 | 72 | |
| 73 | - $arrRoundsId = $rounds->map(function ($value, $key) { |
|
| 73 | + $arrRoundsId = $rounds->map(function($value, $key) { |
|
| 74 | 74 | return $value->id; |
| 75 | 75 | })->toArray(); |
| 76 | 76 | Fight::destroy($arrRoundsId); |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | /** |
| 65 | - * @param $settings |
|
| 65 | + * @param ChampionshipSettings $settings |
|
| 66 | 66 | * @param Championship $championship |
| 67 | 67 | */ |
| 68 | 68 | public static function generateFights(Collection $rounds, $settings, Championship $championship = null) |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | $fighter2 = isset($round->teams[1]) ? $round->teams[1] : null; |
| 104 | 104 | $fighter3 = isset($round->teams[2]) ? $round->teams[2] : null; |
| 105 | 105 | } else { |
| 106 | - $fighter1 = isset($round->competitors[0]) ? $round->competitors[0] : null; |
|
| 107 | - $fighter2 = isset($round->competitors[1]) ? $round->competitors[1] : null; |
|
| 108 | - $fighter3 = isset($round->competitors[2]) ? $round->competitors[2] : null; |
|
| 106 | + $fighter1 = isset($round->competitors[0]) ? $round->competitors[0] : null; |
|
| 107 | + $fighter2 = isset($round->competitors[1]) ? $round->competitors[1] : null; |
|
| 108 | + $fighter3 = isset($round->competitors[2]) ? $round->competitors[2] : null; |
|
| 109 | 109 | } |
| 110 | 110 | switch ($numRound) { |
| 111 | 111 | case 1: |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | $fighters = self::getActorsToFights($championship, $round2); |
| 166 | 166 | |
| 167 | - $away = $fighters->splice(sizeof($fighters) / 2); // 2 |
|
| 167 | + $away = $fighters->splice(sizeof($fighters) / 2); // 2 |
|
| 168 | 168 | |
| 169 | 169 | $home = $fighters; // 1 |
| 170 | 170 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * Save a Fight. |
| 89 | - * @param $rounds |
|
| 89 | + * @param \Illuminate\Support\Collection $rounds |
|
| 90 | 90 | * @param int $numRound |
| 91 | 91 | */ |
| 92 | 92 | public static function savePreliminaryFightRound($rounds, $numRound = 1) |
@@ -154,6 +154,9 @@ discard block |
||
| 154 | 154 | // } |
| 155 | 155 | // } |
| 156 | 156 | |
| 157 | + /** |
|
| 158 | + * @param \Illuminate\Support\Collection $rounds |
|
| 159 | + */ |
|
| 157 | 160 | public static function saveRoundRobinFights(Championship $championship, $rounds) |
| 158 | 161 | { |
| 159 | 162 | |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | -$directEliminationTree = $championship->tree->map(function ($item, $key) use ($championship) { |
|
| 3 | - if ($championship->category->isTeam()){ |
|
| 2 | +$directEliminationTree = $championship->tree->map(function($item, $key) use ($championship) { |
|
| 3 | + if ($championship->category->isTeam()) { |
|
| 4 | 4 | |
| 5 | 5 | $fighter1 = $item->team1 != null ? $item->team1->name : "Bye"; |
| 6 | 6 | $fighter2 = $item->team2 != null ? $item->team2->name : "Bye"; |
| 7 | - }else{ |
|
| 7 | + } else { |
|
| 8 | 8 | $fighter1 = $item->competitors[0] != null ? $item->competitor[0]->user->name : "Bye"; |
| 9 | 9 | $fighter2 = $item->competitors[1] != null ? $item->competitor[1]->user->name : "Bye"; |
| 10 | 10 | } |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | $fighter1 = $item->team1 != null ? $item->team1->name : "Bye"; |
| 6 | 6 | $fighter2 = $item->team2 != null ? $item->team2->name : "Bye"; |
| 7 | - }else{ |
|
| 7 | + } else{ |
|
| 8 | 8 | $fighter1 = $item->competitors[0] != null ? $item->competitor[0]->user->name : "Bye"; |
| 9 | 9 | $fighter2 = $item->competitors[1] != null ? $item->competitor[1]->user->name : "Bye"; |
| 10 | 10 | } |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | use Xoco70\KendoTournaments\Models\Tournament; |
| 5 | 5 | use Xoco70\KendoTournaments\Models\Venue; |
| 6 | 6 | |
| 7 | -$factory->define(Tournament::class, function (Faker\Generator $faker) { |
|
| 7 | +$factory->define(Tournament::class, function(Faker\Generator $faker) { |
|
| 8 | 8 | $users = User::all()->pluck('id')->toArray(); |
| 9 | 9 | |
| 10 | 10 | $dateIni = $faker->dateTimeBetween('now', '+2 weeks')->format('Y-m-d'); |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | use Xoco70\KendoTournaments\Models\Championship; |
| 5 | 5 | use Xoco70\KendoTournaments\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 | |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | public function rounds() |
| 33 | 33 | { |
| 34 | - return $this->belongsToMany(Round::class,'round_team')->withTimestamps(); |
|
| 34 | + return $this->belongsToMany(Round::class, 'round_team')->withTimestamps(); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | |
| 77 | 77 | public function rounds() |
| 78 | 78 | { |
| 79 | - return $this->belongsToMany(Round::class,'round_competitor')->withTimestamps(); |
|
| 79 | + return $this->belongsToMany(Round::class, 'round_competitor')->withTimestamps(); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | } |