Completed
Push — master ( 4de8ed...77e04a )
by Julien
05:04
created
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.
resources/views/partials/tree/brackets/lower_bracket.blade.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2
-$default_top1 =81;
3
-$default_top2 =132;
2
+$default_top1 = 81;
3
+$default_top2 = 132;
4 4
 
5
-$top1 = $default_top1 + ($numGroup-1) * 204;
6
-$top2 = $default_top2 + ($numGroup-1) * 204;
5
+$top1 = $default_top1 + ($numGroup - 1) * 204;
6
+$top2 = $default_top2 + ($numGroup - 1) * 204;
7 7
 
8
-$top = $default_top1 + ($numGroup-1) * 204;
8
+$top = $default_top1 + ($numGroup - 1) * 204;
9 9
 
10 10
 
11 11
 ?>
Please login to merge, or discard this patch.
resources/views/partials/tree/brackets/fight.blade.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2
-$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound-1)-1) * 51);
2
+$topOffset = ($numRound == 1 ? 0 : (pow(2, $numRound - 1) - 1) * 51);
3 3
 $top = \App\Bracket::getTopFight($numRound, $numFight) + $topOffset;
4 4
 
5 5
 $left = \App\Bracket::getLeftFight($numRound);
6
-if ($numRound== 3) dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset);
6
+if ($numRound == 3) dump(\App\Bracket::getTopFight($numRound, $numFight), $topOffset);
7 7
 ?>
8 8
 
9 9
 <div class="match-wrapper" style="top: {{ $top }}px; left: {{$left}}px; width: 150px;">
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,9 @@
 block discarded – undo
3 3
 $top = \App\Bracket::getTopFight($numRound, $numFight) + $topOffset;
4 4
 
5 5
 $left = \App\Bracket::getLeftFight($numRound);
6
-if ($numRound== 3) dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset);
6
+if ($numRound== 3) {
7
+    dump(\App\Bracket::getTopFight($numRound, $numFight),$topOffset);
8
+}
7 9
 ?>
8 10
 
9 11
 <div class="match-wrapper" style="top: {{ $top }}px; left: {{$left}}px; width: 150px;">
Please login to merge, or discard this patch.
resources/views/partials/tree/brackets/upper_bracket.blade.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2
-$default_top1 =30;
3
-$default_top2 =81;
2
+$default_top1 = 30;
3
+$default_top2 = 81;
4 4
 
5
-$top1 = $default_top1 + ($numGroup-1) * 204;
6
-$top2 = $default_top2 + ($numGroup-1) * 204;
5
+$top1 = $default_top1 + ($numGroup - 1) * 204;
6
+$top2 = $default_top2 + ($numGroup - 1) * 204;
7 7
 
8 8
 $default_left = 189;
9
-$left = $default_left * ($numRound-1);
9
+$left = $default_left * ($numRound - 1);
10 10
 
11 11
 
12 12
 ?>
Please login to merge, or discard this patch.
src/TreeController.php 2 patches
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   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
             $generation->run();
55 55
         } catch (TreeGenerationException $e) {
56 56
             redirect()->back()
57
-                ->withErrors([$numFighters.'-'.$e->getMessage()]);
57
+                ->withErrors([$numFighters . '-' . $e->getMessage()]);
58 58
         }
59 59
 
60 60
         return back()
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
     {
85 85
         if ($isTeam) {
86 86
             $championship = Championship::find(2);
87
-            factory(Team::class, (int) $numFighters)->create(['championship_id' => $championship->id]);
87
+            factory(Team::class, (int)$numFighters)->create(['championship_id' => $championship->id]);
88 88
         } else {
89 89
             $championship = Championship::find(1);
90
-            $users = factory(User::class, (int) $numFighters)->create();
90
+            $users = factory(User::class, (int)$numFighters)->create();
91 91
             foreach ($users as $user) {
92 92
                 factory(Competitor::class)->create(
93 93
                     ['championship_id' => $championship->id,
Please login to merge, or discard this patch.
resources/views/partials/tree/brackets/playerList.blade.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 $prefix = "directElimination";
3
-if ($championship->hasPreliminary() && $numRound ==1){
3
+if ($championship->hasPreliminary() && $numRound == 1) {
4 4
     $prefix = "preliminary";
5 5
 }
6
-$className = $prefix."_select";
7
-$selectName = $prefix."_fighters[]";
6
+$className = $prefix . "_select";
7
+$selectName = $prefix . "_fighters[]";
8 8
 ?>
9 9
 <select name="{{ $selectName }}" class={{$className}}>
10 10
     <option {{ $selected == '' ? ' selected' : '' }} ></option>
Please login to merge, or discard this patch.
database/migrations/2015_11_01_171759_create_Tournament_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 {
9 9
     public function up()
10 10
     {
11
-        Schema::create('tournament', function (Blueprint $table) {
11
+        Schema::create('tournament', function(Blueprint $table) {
12 12
             $table->increments('id');
13 13
             //TODO Added ->nullable() to solve FK issue with Sqlite :(
14 14
             $table->Integer('user_id')->unsigned()->nullable()->index();
Please login to merge, or discard this patch.
src/TournamentsServiceProvider.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -16,18 +16,18 @@
 block discarded – undo
16 16
      */
17 17
     public function boot(Router $router)
18 18
     {
19
-        $viewPath = __DIR__.'/../resources/views';
19
+        $viewPath = __DIR__ . '/../resources/views';
20 20
         $this->loadViewsFrom($viewPath, 'laravel-tournaments');
21 21
 
22
-        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
23
-        $this->loadTranslationsFrom(__DIR__.'/../translations', 'laravel-tournaments');
22
+        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
23
+        $this->loadTranslationsFrom(__DIR__ . '/../translations', 'laravel-tournaments');
24 24
 
25
-        $this->publishes([__DIR__.'/../database/migrations' => $this->app->databasePath().'/migrations'], 'migrations');
26
-        $this->publishes([__DIR__.'/../database/seeds' => $this->app->databasePath().'/seeds'], 'seeds');
27
-        $this->publishes([__DIR__.'/../database/factories' => $this->app->databasePath().'/factories'], 'seeds');
28
-        $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-tournaments')], 'assets');
25
+        $this->publishes([__DIR__ . '/../database/migrations' => $this->app->databasePath() . '/migrations'], 'migrations');
26
+        $this->publishes([__DIR__ . '/../database/seeds' => $this->app->databasePath() . '/seeds'], 'seeds');
27
+        $this->publishes([__DIR__ . '/../database/factories' => $this->app->databasePath() . '/factories'], 'seeds');
28
+        $this->publishes([__DIR__ . '/../resources/assets' => public_path('vendor/laravel-tournaments')], 'assets');
29 29
 
30
-        $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function ($router) {
30
+        $router->group(['prefix' => 'laravel-tournaments', 'middleware' => ['web']], function($router) {
31 31
             $router->get('/', 'Xoco70\LaravelTournaments\TreeController@index')->name('tree.index');
32 32
             $router->post('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@store')->name('tree.store');
33 33
             $router->put('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@update')->name('tree.update');
Please login to merge, or discard this patch.