Completed
Push — master ( 332511...198978 )
by Julien
02:42
created
database/migrations/2016_11_23_125509_create_Fight_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('fight', function (Blueprint $table) {
16
+        Schema::create('fight', function(Blueprint $table) {
17 17
             $table->increments('id');
18 18
             $table->integer('short_id')->unsigned()->nullable();
19 19
             $table->integer('fighters_group_id')->unsigned()->index();
Please login to merge, or discard this patch.
database/migrations/2015_12_03_230346_create_Category_table.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('category', function (Blueprint $table) {
15
+        Schema::create('category', function(Blueprint $table) {
16 16
             $table->increments('id');
17 17
             $table->string('name');
18 18
             $table->string('gender')->nullable();
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
             $table->engine = 'InnoDB';
29 29
         });
30 30
 
31
-        Schema::create('championship', function (Blueprint $table) {
31
+        Schema::create('championship', function(Blueprint $table) {
32 32
             $table->increments('id');
33 33
             $table->integer('tournament_id')->unsigned()->index();
34 34
             $table->integer('category_id')->unsigned()->index();
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             $table->engine = 'InnoDB';
51 51
         });
52 52
 
53
-        Schema::create('competitor', function (Blueprint $table) {
53
+        Schema::create('competitor', function(Blueprint $table) {
54 54
             $table->increments('id');
55 55
             $table->integer('short_id')->unsigned()->nullable();
56 56
             $table->integer('championship_id')->unsigned()->index();
Please login to merge, or discard this patch.
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/TreeGen/TreeGen.php 2 patches
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
     /**
50 50
      * Get the biggest entity group
51
-     * @param $userGroups
51
+     * @param Collection $userGroups
52 52
      *
53 53
      * @return int
54 54
      */
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
     /**
109 109
      * Repart BYE in the tree,
110
-     * @param $fighterGroups
110
+     * @param Collection $fighterGroups
111 111
      * @param int $max
112 112
      *
113 113
      * @return Collection
@@ -175,9 +175,9 @@  discard block
 block discarded – undo
175 175
     }
176 176
 
177 177
     /**
178
-     * @param $area
179
-     * @param $order
180
-     * @param $round
178
+     * @param integer $area
179
+     * @param integer $order
180
+     * @param integer $round
181 181
      * @param $parent
182 182
      * @return FightersGroup
183 183
      */
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
 
339 339
     /**
340 340
      * @param Collection $fighters
341
-     * @param $frequency
342
-     * @param $sizeGroupBy
341
+     * @param integer $frequency
342
+     * @param integer $sizeGroupBy
343 343
      * @param $bye
344 344
      * @return Collection
345 345
      */
@@ -362,8 +362,8 @@  discard block
 block discarded – undo
362 362
     /**
363 363
      * @param $frequency
364 364
      * @param $sizeGroupBy
365
-     * @param $count
366
-     * @param $byeCount
365
+     * @param integer $count
366
+     * @param integer $byeCount
367 367
      * @return bool
368 368
      */
369 369
     private function shouldInsertBye($frequency, $sizeGroupBy, $count, $byeCount): bool
Please login to merge, or discard this patch.
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.
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/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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@
 block discarded – undo
68 68
      */
69 69
     public function generateNextRoundsFights()
70 70
     {
71
-        if ($this->championship->category->isTeam){
71
+        if ($this->championship->category->isTeam) {
72 72
             $championship = $this->championship->withCount('teams', 'competitors')->find(2);
73
-        }else{
73
+        } else {
74 74
             $championship = $this->championship->withCount('teams', 'competitors')->first();
75 75
         }
76 76
 
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     {
71 71
         if ($this->championship->category->isTeam){
72 72
             $championship = $this->championship->withCount('teams', 'competitors')->find(2);
73
-        }else{
73
+        } else{
74 74
             $championship = $this->championship->withCount('teams', 'competitors')->first();
75 75
         }
76 76
 
@@ -90,7 +90,9 @@  discard block
 block discarded – undo
90 90
     {
91 91
         foreach ($fightsByRound as $fight) {
92 92
             $parentGroup = $fight->group->parent;
93
-            if ($parentGroup == null) break;
93
+            if ($parentGroup == null) {
94
+                break;
95
+            }
94 96
             $parentFight = $parentGroup->fights->get(0); //TODO This Might change when extending to Preliminary
95 97
 
96 98
             // IN this $fight, is c1 or c2 has the info?
@@ -164,10 +166,14 @@  discard block
 block discarded – undo
164 166
      */
165 167
     public function hasDeterminedParent()
166 168
     {
167
-        if ($this->group->has2Fighters()) return true;
169
+        if ($this->group->has2Fighters()) {
170
+            return true;
171
+        }
168 172
         foreach ($this->group->children as $child) {
169 173
             $fight = $child->fights->get(0);
170
-            if ($fight->has2Fighters()) return false;
174
+            if ($fight->has2Fighters()) {
175
+                return false;
176
+            }
171 177
         }
172 178
         return true;
173 179
     }
Please login to merge, or discard this patch.
src/TreeGen/PlayOffTreeGen.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Illuminate\Support\Collection;
6 6
 use Illuminate\Support\Facades\App;
7 7
 use Xoco70\KendoTournaments\Models\Championship;
8
-use Xoco70\KendoTournaments\Models\Fight;
9 8
 use Xoco70\KendoTournaments\Models\PreliminaryFight;
10 9
 
11 10
 class PlayOffTreeGen extends TreeGen
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,6 @@
 block discarded – undo
14 14
 
15 15
     /**
16 16
      * Calculate the Byes need to fill the Championship Tree.
17
-     * @param Championship $championship
18 17
      * @param $fighters
19 18
      * @return Collection
20 19
      */
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.