Completed
Push — master ( b13aa8...0a3a64 )
by Julien
11:57
created
database/migrations/2016_10_24_223706_create_FightersGroup_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
database/seeds/CompetitorSeeder.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
src/models/Championship.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,8 +169,9 @@
 block discarded – undo
169 169
 
170 170
     public function buildName()
171 171
     {
172
-        if ($this->settings != null && $this->settings->alias != null)
173
-            return $this->settings->alias;
172
+        if ($this->settings != null && $this->settings->alias != null) {
173
+                    return $this->settings->alias;
174
+        }
174 175
 
175 176
         if ($this->hasNoCustomSettings()) {
176 177
             return $this->category->name;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
     {
30 30
         parent::boot();
31 31
 
32
-        static::deleting(function ($championship) {
32
+        static::deleting(function($championship) {
33 33
             $championship->competitors()->delete();
34 34
             $championship->settings()->delete();
35 35
         });
36
-        static::restoring(function ($championship) {
36
+        static::restoring(function($championship) {
37 37
             $championship->competitors()->restore();
38 38
             $championship->settings()->restore();
39 39
         });
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
      */
219 219
     public function groupsFromRound($round)
220 220
     {
221
-        return $this->fightersGroups()->where('round','>=', $round);
221
+        return $this->fightersGroups()->where('round', '>=', $round);
222 222
     }
223 223
 
224 224
     /**
Please login to merge, or discard this patch.
src/Models/DirectEliminationFight.php 1 patch
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -2,9 +2,6 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/TreeGen/TreeGen.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     private function getMaxFightersByEntity($userGroups): int
56 56
     {
57 57
         return $userGroups
58
-            ->sortByDesc(function ($group) {
58
+            ->sortByDesc(function($group) {
59 59
                 return $group->count();
60 60
             })
61 61
             ->first()
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     protected function getTreeSize($fighterCount, $groupSize)
94 94
     {
95 95
         $square = collect([1, 2, 4, 8, 16, 32, 64]);
96
-        $squareMultiplied = $square->map(function ($item) use ($groupSize) {
96
+        $squareMultiplied = $square->map(function($item) use ($groupSize) {
97 97
             return $item * $groupSize;
98 98
         });
99 99
 
Please login to merge, or discard this patch.
Doc Comments   +9 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
     /**
54 54
      * Get the biggest entity group
55
-     * @param $userGroups
55
+     * @param Collection $userGroups
56 56
      *
57 57
      * @return int
58 58
      */
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
     /**
113 113
      * Repart BYE in the tree,
114
-     * @param $fighterGroups
114
+     * @param Collection $fighterGroups
115 115
      * @param int $max
116 116
      *
117 117
      * @return Collection
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
179 179
     }
180 180
 
181 181
     /**
182
-     * @param $area
183
-     * @param $order
184
-     * @param $round
182
+     * @param integer $area
183
+     * @param integer $order
184
+     * @param integer $round
185 185
      * @param $parent
186 186
      * @return FightersGroup
187 187
      */
@@ -326,8 +326,8 @@  discard block
 block discarded – undo
326 326
 
327 327
     /**
328 328
      * @param Collection $fighters
329
-     * @param $frequency
330
-     * @param $sizeGroupBy
329
+     * @param integer $frequency
330
+     * @param integer $sizeGroupBy
331 331
      * @param $bye
332 332
      * @return Collection
333 333
      */
@@ -350,8 +350,8 @@  discard block
 block discarded – undo
350 350
     /**
351 351
      * @param $frequency
352 352
      * @param $sizeGroupBy
353
-     * @param $count
354
-     * @param $byeCount
353
+     * @param integer $count
354
+     * @param integer $byeCount
355 355
      * @return bool
356 356
      */
357 357
     private function shouldInsertBye($frequency, $sizeGroupBy, $count, $byeCount): bool
@@ -361,7 +361,6 @@  discard block
 block discarded – undo
361 361
 
362 362
 
363 363
     /**
364
-     * @param Championship $championship
365 364
      */
366 365
     protected function destroyPreviousFights()
367 366
     {
Please login to merge, or discard this patch.
src/TreeGen/DirectEliminationTreeGen.php 3 patches
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
 class DirectEliminationTreeGen extends TreeGen
12 11
 {
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -86,7 +86,9 @@  discard block
 block discarded – undo
86 86
     {
87 87
         foreach ($fightsByRound as $fight) {
88 88
             $parentGroup = $fight->group->parent;
89
-            if ($parentGroup == null) break;
89
+            if ($parentGroup == null) {
90
+                break;
91
+            }
90 92
             $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary
91 93
 
92 94
             // IN this $fight, is c1 or c2 has the info?
@@ -160,10 +162,14 @@  discard block
 block discarded – undo
160 162
      */
161 163
     public function hasDeterminedParent()
162 164
     {
163
-        if ($this->group->has2Fighters()) return true;
165
+        if ($this->group->has2Fighters()) {
166
+            return true;
167
+        }
164 168
         foreach ($this->group->children as $child) {
165 169
             $fight = $child->fights->get(0);
166
-            if ($fight->has2Fighters()) return false;
170
+            if ($fight->has2Fighters()) {
171
+                return false;
172
+            }
167 173
         }
168 174
         return true;
169 175
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
      * @param $numFighters
191 191
      * @return int
192 192
      */
193
-    public function getNumRounds($numFighters){
193
+    public function getNumRounds($numFighters) {
194 194
         return intval(log($numFighters, 2));
195 195
     }
196 196
 }
Please login to merge, or discard this patch.
src/models/Fight.php 1 patch
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,7 +46,9 @@  discard block
 block discarded – undo
46 46
      */
47 47
     protected static function getFightersWithByes(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) {
@@ -167,18 +169,26 @@  discard block
 block discarded – undo
167 169
      */
168 170
     public function hasDeterminedParent()
169 171
     {
170
-        if ($this->has2Fighters()) return true;
172
+        if ($this->has2Fighters()) {
173
+            return true;
174
+        }
171 175
         foreach ($this->group->children as $child) {
172 176
             $fight = $child->fights->get(0);
173
-            if ($fight->has2Fighters()) return false;
177
+            if ($fight->has2Fighters()) {
178
+                return false;
179
+            }
174 180
         }
175 181
         return true;
176 182
     }
177 183
 
178 184
     public function shouldBeInFightList()
179 185
     {
180
-        if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) return false;
181
-        if ($this->has2Fighters()) return true;
186
+        if ($this->belongsToFirstRound() && $this->dontHave2Fighters()) {
187
+            return false;
188
+        }
189
+        if ($this->has2Fighters()) {
190
+            return true;
191
+        }
182 192
         // We aint in the first round, and there is 1 or 0 competitor
183 193
         // We check children, and see :
184 194
         // if there is 2  - 2 fighters -> undetermine, we cannot add it to fight list
@@ -204,7 +214,9 @@  discard block
 block discarded – undo
204 214
     private function belongsToFirstRound()
205 215
     {
206 216
         $firstRoundFights = $this->group->championship->firstRoundFights->pluck('id')->toArray();
207
-        if (in_array($this->id, $firstRoundFights)) return true;
217
+        if (in_array($this->id, $firstRoundFights)) {
218
+            return true;
219
+        }
208 220
         return false;
209 221
     }
210 222
 
Please login to merge, or discard this patch.
src/TreeController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -10,8 +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
-use Xoco70\KendoTournaments\Models\FightersGroup;
15 13
 use Xoco70\KendoTournaments\Models\Team;
16 14
 use Xoco70\KendoTournaments\Models\Tournament;
17 15
 
Please login to merge, or discard this patch.
src/TreeGen/CreateDirectEliminationTree.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
     }
234 234
 
235 235
     /**
236
-     * @param $roundNumber
236
+     * @param integer $roundNumber
237 237
      */
238 238
     private function assignFightersToBracket($roundNumber)
239 239
     {
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
     /**
259 259
      * @param $selected
260 260
      * @param $fighter
261
-     * @param $html
261
+     * @param string $html
262 262
      * @return string
263 263
      */
264 264
     private function addOptionToSelect($selected, $fighter, $html): string
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.