Completed
Push — master ( 54ddf1...ef6d8d )
by Julien
02:51
created
src/Models/PreliminaryFight.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/models/FightersGroup.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,9 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/TreeGen/DirectEliminationTreeGen.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
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
 {
Please login to merge, or discard this patch.
src/TreeGen/PlayOffTreeGen.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/TreeGen/CreateDirectEliminationTree.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/models/Fight.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,7 +44,9 @@  discard block
 block discarded – undo
44 44
      */
45 45
     protected static function getFightersWithByes(FightersGroup $group)
46 46
     {
47
-        if ($group == null) return null;
47
+        if ($group == null) {
48
+            return null;
49
+        }
48 50
         $fighters = $group->getFightersWithBye();
49 51
         $fighterType = $group->getFighterType();
50 52
         if (sizeof($fighters) == 0) {
@@ -127,8 +129,12 @@  discard block
 block discarded – undo
127 129
      */
128 130
     public function shouldBeInFightList()
129 131
     {
130
-        if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false;
131
-        if ($this->has2Fighters()) return true;
132
+        if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) {
133
+            return false;
134
+        }
135
+        if ($this->has2Fighters()) {
136
+            return true;
137
+        }
132 138
         // We aint in the first round, and there is 1 or 0 competitor
133 139
         // We check children, and see :
134 140
         // if there is 2  - 2 fighters -> undetermine, we cannot add it to fight list
@@ -157,7 +163,9 @@  discard block
 block discarded – undo
157 163
     private function belongsToFirstRound()
158 164
     {
159 165
         $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray();
160
-        if (in_array($this->id, $firstRoundFights)) return true;
166
+        if (in_array($this->id, $firstRoundFights)) {
167
+            return true;
168
+        }
161 169
         return false;
162 170
     }
163 171
 
Please login to merge, or discard this patch.
database/factories/ChampionshipFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 use Xoco70\KendoTournaments\Models\Championship;
6 6
 use Xoco70\KendoTournaments\Models\Tournament;
7 7
 
8
-$factory->define(Championship::class, function (Faker\Generator $faker) {
8
+$factory->define(Championship::class, function(Faker\Generator $faker) {
9 9
     $tournaments = Tournament::all()->pluck('id')->toArray();
10 10
     $categories = Cat::all()->pluck('id')->toArray();
11 11
 
Please login to merge, or discard this patch.
database/factories/CategoryFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 use Xoco70\KendoTournaments\Models\Category as Cat;
5 5
 
6
-$factory->define(Cat::class, function (Faker\Generator $faker) {
6
+$factory->define(Cat::class, function(Faker\Generator $faker) {
7 7
     $name = ['categories.junior',
8 8
         'categories.junior_team',
9 9
         'categories.men_single',
Please login to merge, or discard this patch.
src/TreeController.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
 use Xoco70\KendoTournaments\Models\Championship;
11 11
 use Xoco70\KendoTournaments\Models\ChampionshipSettings;
12 12
 use Xoco70\KendoTournaments\Models\Competitor;
13
-use Xoco70\KendoTournaments\Models\Fight;
14 13
 use Xoco70\KendoTournaments\Models\FightersGroup;
15 14
 use Xoco70\KendoTournaments\Models\Team;
16 15
 use Xoco70\KendoTournaments\Models\Tournament;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
      *
42 42
      * @param Request $request
43 43
      *
44
-     * @return \Illuminate\Http\Response|string
44
+     * @return \Illuminate\Http\RedirectResponse
45 45
      */
46 46
     public function store(Request $request, $championshipId)
47 47
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,8 +118,8 @@
 block discarded – undo
118 118
         $query = FightersGroup::with('fights')
119 119
             ->where('championship_id', $championship->id);
120 120
 
121
-        if ($championship->hasPreliminary()){
122
-            $query = $query->where('round','>',1);
121
+        if ($championship->hasPreliminary()) {
122
+            $query = $query->where('round', '>', 1);
123 123
         }
124 124
         $groups = $query->get();
125 125
         $fights = $request->fights;
Please login to merge, or discard this patch.