| @@ -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 | $championshipId = $faker->randomElement($tcs); | 
| @@ -51,7 +51,7 @@ | ||
| 51 | 51 |          DB::table('fighters_group_competitor')->delete(); | 
| 52 | 52 |          DB::table('fighters_group_team')->delete(); | 
| 53 | 53 |          DB::table('competitor')->delete(); | 
| 54 | -        DB::table('users')->where('id','<>',1)->delete(); | |
| 54 | +        DB::table('users')->where('id', '<>', 1)->delete(); | |
| 55 | 55 | |
| 56 | 56 |          $championship = Championship::with('teams', 'users', 'category', 'settings')->find($championship->id); | 
| 57 | 57 | $numFighters = $request->numFighters; | 
| @@ -289,9 +289,15 @@ | ||
| 289 | 289 | */ | 
| 290 | 290 | public function getValueToUpdate() | 
| 291 | 291 |      { | 
| 292 | - if ($this->c1 != null && $this->c2 != null) return null; | |
| 293 | - if ($this->c1 != null) return "c1"; | |
| 294 | - if ($this->c2 != null) return "c2"; | |
| 292 | +        if ($this->c1 != null && $this->c2 != null) { | |
| 293 | + return null; | |
| 294 | + } | |
| 295 | +        if ($this->c1 != null) { | |
| 296 | + return "c1"; | |
| 297 | + } | |
| 298 | +        if ($this->c2 != null) { | |
| 299 | + return "c2"; | |
| 300 | + } | |
| 295 | 301 | return null; | 
| 296 | 302 | } | 
| 297 | 303 | } | 
| 298 | 304 | \ No newline at end of file | 
| @@ -206,7 +206,7 @@ | ||
| 206 | 206 |              foreach ($fightsByRound as $numFight => $fight) { | 
| 207 | 207 | |
| 208 | 208 | $parentGroup = $fight->group->parent; | 
| 209 | - if ($parentGroup == null ) break; | |
| 209 | + if ($parentGroup == null) break; | |
| 210 | 210 | $parentFight = $parentGroup->fights->get(0); | 
| 211 | 211 | |
| 212 | 212 | // IN this $fight, if it is the first child or the second child --> c1 or c2 in parent | 
| @@ -206,7 +206,9 @@ | ||
| 206 | 206 |              foreach ($fightsByRound as $numFight => $fight) { | 
| 207 | 207 | |
| 208 | 208 | $parentGroup = $fight->group->parent; | 
| 209 | - if ($parentGroup == null ) break; | |
| 209 | +                if ($parentGroup == null ) { | |
| 210 | + break; | |
| 211 | + } | |
| 210 | 212 | $parentFight = $parentGroup->fights->get(0); | 
| 211 | 213 | |
| 212 | 214 | // IN this $fight, if it is the first child or the second child --> c1 or c2 in parent | 
| @@ -24,11 +24,11 @@ discard block | ||
| 24 | 24 |      { | 
| 25 | 25 | parent::boot(); | 
| 26 | 26 | |
| 27 | -        static::deleting(function ($championship) { | |
| 27 | +        static::deleting(function($championship) { | |
| 28 | 28 | $championship->competitors()->delete(); | 
| 29 | 29 | $championship->settings()->delete(); | 
| 30 | 30 | }); | 
| 31 | -        static::restoring(function ($championship) { | |
| 31 | +        static::restoring(function($championship) { | |
| 32 | 32 | $championship->competitors()->restore(); | 
| 33 | 33 | $championship->settings()->restore(); | 
| 34 | 34 | }); | 
| @@ -213,7 +213,7 @@ discard block | ||
| 213 | 213 | */ | 
| 214 | 214 | public function groupsByRound($round) | 
| 215 | 215 |      { | 
| 216 | -        return $this->fightersGroups()->where('round',$round); | |
| 216 | +        return $this->fightersGroups()->where('round', $round); | |
| 217 | 217 | } | 
| 218 | 218 | |
| 219 | 219 | /** | 
| @@ -223,6 +223,6 @@ discard block | ||
| 223 | 223 | */ | 
| 224 | 224 | public function fightsByRound($round) | 
| 225 | 225 |      { | 
| 226 | -        return $this->hasManyThrough(Fight::class, FightersGroup::class)->where('round',$round); | |
| 226 | +        return $this->hasManyThrough(Fight::class, FightersGroup::class)->where('round', $round); | |
| 227 | 227 | } | 
| 228 | 228 | } | 
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | $this->championship = $championship; | 
| 26 | 26 | $this->names = $names; | 
| 27 | 27 | |
| 28 | -        $this->firstRoundName = $names->first()->map(function ($item) use ($championship) { | |
| 28 | +        $this->firstRoundName = $names->first()->map(function($item) use ($championship) { | |
| 29 | 29 | $fighters = $item->getFighters(); | 
| 30 | 30 | $fighter1 = $fighters->get(0); | 
| 31 | 31 | $fighter2 = $fighters->get(1); | 
| @@ -53,7 +53,9 @@ | ||
| 53 | 53 | $matches = array_chunk($fighters, 2); | 
| 54 | 54 | |
| 55 | 55 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number | 
| 56 | - if (count($this->brackets)) $roundNumber++; | |
| 56 | +        if (count($this->brackets)) { | |
| 57 | + $roundNumber++; | |
| 58 | + } | |
| 57 | 59 | |
| 58 | 60 | $countMatches = count($matches); | 
| 59 | 61 | //Create the first full round of fighters, some may be blank if waiting on the results of a previous round | 
| @@ -130,7 +130,7 @@ discard block | ||
| 130 | 130 | private function getTreeSize($fighterCount, $groupSize) | 
| 131 | 131 |      { | 
| 132 | 132 | $square = collect([1, 2, 4, 8, 16, 32, 64]); | 
| 133 | -        $squareMultiplied = $square->map(function ($item, $key) use ($groupSize) { | |
| 133 | +        $squareMultiplied = $square->map(function($item, $key) use ($groupSize) { | |
| 134 | 134 | return $item * $groupSize; | 
| 135 | 135 | }); | 
| 136 | 136 | |
| @@ -352,7 +352,7 @@ discard block | ||
| 352 | 352 | private function getPreviousRound($currentRound) | 
| 353 | 353 |      { | 
| 354 | 354 | $previousRound = $this->championship->groupsByRound($currentRound + 1)->get(); | 
| 355 | -        dump("previous". $previousRound->pluck('id')); | |
| 355 | +        dump("previous" . $previousRound->pluck('id')); | |
| 356 | 356 | return $previousRound; | 
| 357 | 357 | } | 
| 358 | 358 | |
| @@ -255,7 +255,9 @@ discard block | ||
| 255 | 255 |      { | 
| 256 | 256 | |
| 257 | 257 |          $fighters = $fighters->pluck('id'); | 
| 258 | - if ($shuffle) $fighters->shuffle(); | |
| 258 | +        if ($shuffle) { | |
| 259 | + $fighters->shuffle(); | |
| 260 | + } | |
| 259 | 261 | $group = $this->saveGroup($area, $order, $round, $parent); | 
| 260 | 262 | |
| 261 | 263 | // Add all competitors to Pivot Table | 
| @@ -417,10 +419,14 @@ discard block | ||
| 417 | 419 |      { | 
| 418 | 420 |          if ($this->championship->hasPreliminary()) { | 
| 419 | 421 | $fightersGroup = $fightersByEntity->chunk($this->settings->preliminaryGroupSize); | 
| 420 | - if ($shuffle) $fightersGroup->shuffle(); | |
| 422 | +            if ($shuffle) { | |
| 423 | + $fightersGroup->shuffle(); | |
| 424 | + } | |
| 421 | 425 |          } elseif ($this->championship->isDirectEliminationType() || $round > 1) { | 
| 422 | 426 | $fightersGroup = $fightersByEntity->chunk(2); | 
| 423 | - if ($shuffle) $fightersGroup->shuffle(); | |
| 427 | +            if ($shuffle) { | |
| 428 | + $fightersGroup->shuffle(); | |
| 429 | + } | |
| 424 | 430 |          } else { // Round Robin | 
| 425 | 431 | $fightersGroup = $fightersByEntity->chunk($fightersByEntity->count()); | 
| 426 | 432 | } |