Completed
Push — master ( ecd0b1...0e1171 )
by Sam
04:52
created
app/Providers/RouteServiceProvider.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
     protected function mapWebRoutes()
54 54
     {
55 55
         Route::middleware('web')
56
-             ->namespace($this->namespace)
57
-             ->group(base_path('routes/web.php'));
56
+                ->namespace($this->namespace)
57
+                ->group(base_path('routes/web.php'));
58 58
     }
59 59
 
60 60
     /**
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
     protected function mapApiRoutes()
68 68
     {
69 69
         Route::prefix('api')
70
-             ->middleware('api')
71
-             ->namespace($this->namespace)
72
-             ->group(base_path('routes/api.php'));
70
+                ->middleware('api')
71
+                ->namespace($this->namespace)
72
+                ->group(base_path('routes/api.php'));
73 73
     }
74 74
 }
Please login to merge, or discard this patch.
app/Console/Kernel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
      */
36 36
     protected function commands()
37 37
     {
38
-        $this->load(__DIR__.'/Commands');
38
+        $this->load(__DIR__ . '/Commands');
39 39
 
40 40
         require base_path('routes/console.php');
41 41
     }
Please login to merge, or discard this patch.
app/Http/Middleware/CheckAdmin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,7 @@
 block discarded – undo
17 17
     {
18 18
         if (\Bouncer::can('view-admin-pages')) {
19 19
             return $next($request);
20
-        }
21
-        else {
20
+        } else {
22 21
             return redirect()->route('home');
23 22
         }
24 23
     }
Please login to merge, or discard this patch.
app/Http/Middleware/Authenticate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
      */
15 15
     protected function redirectTo($request)
16 16
     {
17
-        if (! $request->expectsJson()) {
17
+        if (!$request->expectsJson()) {
18 18
             return route('login');
19 19
         }
20 20
     }
Please login to merge, or discard this patch.
app/Http/Middleware/CheckAssociation.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,8 +28,7 @@
 block discarded – undo
28 28
 
29 29
         if (Bouncer::can('manage', $association)) {
30 30
             return $next($request);
31
-        }
32
-        else {
31
+        } else {
33 32
             return redirect()->route('admin');
34 33
         }
35 34
     }
Please login to merge, or discard this patch.
app/Http/Middleware/Subdomain.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
      */
16 16
     public function handle($request, Closure $next)
17 17
     {
18
-        \URL::defaults(['subdomain' => request('subdomain')]);
18
+        \URL::defaults([ 'subdomain' => request('subdomain') ]);
19 19
 
20 20
         return $next($request);
21 21
     }
Please login to merge, or discard this patch.
app/Http/Controllers/AssociationsController.php 2 patches
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     }
26 26
 
27 27
     public function view(Association $association) {
28
-        return view('association.view', ['association' => $association]);
28
+        return view('association.view', [ 'association' => $association ]);
29 29
     }
30 30
 
31 31
     public function edit(Association $association) {
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
     public function home() {
47 47
         if (!empty($this->association)) {
48
-            return view('association.home', ['association' => $this->association]);
48
+            return view('association.home', [ 'association' => $this->association ]);
49 49
         }
50 50
         else {
51 51
             abort(404);
@@ -53,27 +53,27 @@  discard block
 block discarded – undo
53 53
     }
54 54
 
55 55
     public function divisions(Association $association) {
56
-        return view('association.divisions', ['association' => $association]);
56
+        return view('association.divisions', [ 'association' => $association ]);
57 57
     }
58 58
 
59 59
     public function teams(Association $association) {
60
-        return view('association.teams', ['association' => $association]);
60
+        return view('association.teams', [ 'association' => $association ]);
61 61
     }
62 62
 
63 63
     public function venues(Association $association) {
64
-        return view('association.venues', ['association' => $association]);
64
+        return view('association.venues', [ 'association' => $association ]);
65 65
     }
66 66
 
67 67
     public function series(Association $association) {
68
-        return view('association.series', ['association' => $association]);
68
+        return view('association.series', [ 'association' => $association ]);
69 69
     }
70 70
 
71 71
     public function users(Association $association) {
72
-        return view('association.users', ['association' => $association]);
72
+        return view('association.users', [ 'association' => $association ]);
73 73
     }
74 74
 
75 75
     public function editUser(Association $association, User $user) {
76
-        return view('association.user.edit', ['association' => $association, 'user' => $user]);
76
+        return view('association.user.edit', [ 'association' => $association, 'user' => $user ]);
77 77
     }
78 78
 
79 79
     public function updateUser(Request $request, Association $association, User $user) {
@@ -93,12 +93,12 @@  discard block
 block discarded – undo
93 93
             return redirect($url)->with('success', 'Data saved successfully!');
94 94
         }
95 95
 
96
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
96
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
97 97
 
98 98
     }
99 99
 
100 100
     public function addUser(Association $association) {
101
-        return view('association.user.add', ['association' => $association]);
101
+        return view('association.user.add', [ 'association' => $association ]);
102 102
     }
103 103
 
104 104
     public function submitScoreBegin(Request $request) {
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 
111 111
             // get rounds with start_date < today, but greater than today - 1 week
112 112
             $rounds = Round::whereIn('schedule_id', $schedules->pluck('id'))
113
-                ->where('start_date','>=', date('Y-m-d', strtotime('-1 week')))
113
+                ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week')))
114 114
                 ->where('start_date', '<=', date('Y-m-d', strtotime("today")))->get();
115 115
 
116 116
             $divisions = Division::whereIn('id', $rounds->pluck('division_id'))->get();
117 117
 
118 118
             if (count($divisions) === 1) {
119
-                $request->division_id = $divisions[0]->id;
119
+                $request->division_id = $divisions[ 0 ]->id;
120 120
 
121 121
                 return $this->submitScoreStep2($request);
122 122
             }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 
145 145
             // get rounds with start_date < today, but greater than today - 1 week
146 146
             $rounds = Round::whereIn('schedule_id', $schedules->pluck('id'))
147
-                ->where('start_date','>=', date('Y-m-d', strtotime('-1 week')))
147
+                ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week')))
148 148
                 ->where('start_date', '<=', date('Y-m-d', strtotime("today")))
149 149
                 ->orderBy('start_date', 'DESC')
150 150
                 ->get();
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
     }
207 207
 
208 208
     public function standings() {
209
-        return view('association.standings', ['association' => $this->association]);
209
+        return view('association.standings', [ 'association' => $this->association ]);
210 210
     }
211 211
 
212 212
     public function schedule() {
213
-        return view('association.schedule', ['association' => $this->association]);
213
+        return view('association.schedule', [ 'association' => $this->association ]);
214 214
     }
215 215
 
216 216
     public function css() {
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
             $association->save();
236 236
 
237 237
             // TODO: Do not necessarily "onboard" for certain roles?
238
-            return redirect()->route('onboard.association', ['association' => $association]);
238
+            return redirect()->route('onboard.association', [ 'association' => $association ]);
239 239
         }
240 240
         else {
241 241
             return view('denied');
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
             return redirect($url)->with('success', 'Data saved successfully!');
272 272
         }
273 273
 
274
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
274
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
275 275
 
276 276
     }
277 277
 
278 278
     public function create() {
279 279
         if (Bouncer::can('create', Association::class)) {
280
-            return view('association.create', ['current_user' => \Auth::user()]);
280
+            return view('association.create', [ 'current_user' => \Auth::user() ]);
281 281
         }
282 282
         else {
283 283
             return view('denied');
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     }
286 286
 
287 287
     public function deleteConfirm(Association $association) {
288
-        return view('association.delete', ['association' => $association]);
288
+        return view('association.delete', [ 'association' => $association ]);
289 289
     }
290 290
 
291 291
     public function delete(Association $association) {
@@ -295,13 +295,13 @@  discard block
 block discarded – undo
295 295
     }
296 296
 
297 297
     public function undeleteConfirm(Association $association) {
298
-        return view('association.undelete', ['association' => $association]);
298
+        return view('association.undelete', [ 'association' => $association ]);
299 299
     }
300 300
 
301 301
     public function undelete(Association $association) {
302 302
         $association->restore();
303 303
 
304
-        return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.');
304
+        return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.');
305 305
     }
306 306
 
307 307
 
Please login to merge, or discard this patch.
Braces   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,8 +37,7 @@  discard block
 block discarded – undo
37 37
                 'venues' => Venue::orderBy('name', 'ASC')->where('association_id', $association->id)->get(),
38 38
                 'current_user' => \Auth::user()
39 39
             ]);
40
-        }
41
-        else {
40
+        } else {
42 41
             return view('denied');
43 42
         }
44 43
     }
@@ -46,8 +45,7 @@  discard block
 block discarded – undo
46 45
     public function home() {
47 46
         if (!empty($this->association)) {
48 47
             return view('association.home', ['association' => $this->association]);
49
-        }
50
-        else {
48
+        } else {
51 49
             abort(404);
52 50
         }
53 51
     }
@@ -81,8 +79,7 @@  discard block
 block discarded – undo
81 79
         if (isset($request->assoc_admin)) {
82 80
             Bouncer::assign('assocadmin')->to($user);
83 81
             Bouncer::allow($user)->toManage($association);
84
-        }
85
-        else {
82
+        } else {
86 83
             Bouncer::disallow($user)->toManage($association);
87 84
             Bouncer::retract('assocadmin')->from($user);
88 85
         }
@@ -119,15 +116,13 @@  discard block
 block discarded – undo
119 116
                 $request->division_id = $divisions[0]->id;
120 117
 
121 118
                 return $this->submitScoreStep2($request);
122
-            }
123
-            else {
119
+            } else {
124 120
                 return view('forms.results.choose-division', [
125 121
                     'association' => $this->association,
126 122
                     'divisions' => $divisions,
127 123
                     ]);
128 124
             }
129
-        }
130
-        else {
125
+        } else {
131 126
             abort(404);
132 127
         }
133 128
     }
@@ -153,8 +148,7 @@  discard block
 block discarded – undo
153 148
                 'association' => $this->association,
154 149
                 'rounds' => $rounds,
155 150
                 ]);
156
-        }
157
-        else {
151
+        } else {
158 152
             abort(404);
159 153
         }
160 154
     }
@@ -167,8 +161,7 @@  discard block
 block discarded – undo
167 161
                 'association' => $this->association,
168 162
                 'match' => $match,
169 163
                 ]);
170
-        }
171
-        else {
164
+        } else {
172 165
             abort(404);
173 166
         }
174 167
     }
@@ -195,12 +188,10 @@  discard block
 block discarded – undo
195 188
                 return view('forms.results.thanks', [
196 189
                     'association' => $this->association,
197 190
                     ]);
198
-            }
199
-            else {
191
+            } else {
200 192
                 abort(404);
201 193
             }
202
-        }
203
-        else {
194
+        } else {
204 195
             abort(404);
205 196
         }
206 197
     }
@@ -236,8 +227,7 @@  discard block
 block discarded – undo
236 227
 
237 228
             // TODO: Do not necessarily "onboard" for certain roles?
238 229
             return redirect()->route('onboard.association', ['association' => $association]);
239
-        }
240
-        else {
230
+        } else {
241 231
             return view('denied');
242 232
         }
243 233
     }
@@ -278,8 +268,7 @@  discard block
 block discarded – undo
278 268
     public function create() {
279 269
         if (Bouncer::can('create', Association::class)) {
280 270
             return view('association.create', ['current_user' => \Auth::user()]);
281
-        }
282
-        else {
271
+        } else {
283 272
             return view('denied');
284 273
         }
285 274
     }
Please login to merge, or discard this patch.
app/Http/Controllers/ResultSubmissionsController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
      */
17 17
     public function index(Association $association)
18 18
     {
19
-        return view('result_submissions.approve', ['association' => $association]);
19
+        return view('result_submissions.approve', [ 'association' => $association ]);
20 20
     }
21 21
 
22 22
     /**
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             return redirect($url)->with('success', 'Data saved successfully!');
102 102
         }
103 103
 
104
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
104
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
105 105
     }
106 106
 
107 107
     /**
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,8 +75,7 @@
 block discarded – undo
75 75
 
76 76
         if ($request->delete == 'delete') {
77 77
             $submission->delete();
78
-        }
79
-        else {
78
+        } else {
80 79
             $result = Result::where('match_id', $submission->match_id)->first();
81 80
 
82 81
             if (empty($result)) {
Please login to merge, or discard this patch.
app/Http/Controllers/ScheduleController.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@  discard block
 block discarded – undo
14 14
 {
15 15
 
16 16
     public function view(Schedule $schedule) {
17
-        return view('schedule.view', ['schedule' => $schedule]);
17
+        return view('schedule.view', [ 'schedule' => $schedule ]);
18 18
     }
19 19
 
20 20
     public function create(Series $series) {
21 21
         $association_id = $series->association_id;
22
-        $available_series = \App\Series::where(['association_id' => $series->association_id])->get()->all();
23
-        $available_divisions = \App\Division::orderBy('sequence' , 'ASC')->where(['association_id' => $series->association_id])->get()->all();
22
+        $available_series = \App\Series::where([ 'association_id' => $series->association_id ])->get()->all();
23
+        $available_divisions = \App\Division::orderBy('sequence', 'ASC')->where([ 'association_id' => $series->association_id ])->get()->all();
24 24
 
25 25
         return view('schedule.create', [
26 26
             'association_id' => $association_id,
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         $schedule->start_date = $start_date;
59 59
         $schedule->end_date = $end_date;
60 60
 
61
-        $division = Division::where(['id' => $division_id])->first();
61
+        $division = Division::where([ 'id' => $division_id ])->first();
62 62
 
63 63
         if (!empty($division)) {
64 64
             $schedule->sequence = $division->sequence;
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         $days = $days_interval->format('%a');
78 78
 
79
-        $association = Association::where(['id' => $association_id])->first();
79
+        $association = Association::where([ 'id' => $association_id ])->first();
80 80
         $venues = $association->venues;
81 81
 
82 82
         $round_number = 1;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
             return redirect($url)->with('success', __('Schedule saved successfully!'));
126 126
         }
127 127
 
128
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
128
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
129 129
     }
130 130
 
131 131
     public function update(Request $request) {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             return redirect($url)->with('success', __('Data saved successfully!'));
156 156
         }
157 157
 
158
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
158
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
159 159
 
160 160
     }
161 161
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,8 +62,7 @@
 block discarded – undo
62 62
 
63 63
         if (!empty($division)) {
64 64
             $schedule->sequence = $division->sequence;
65
-        }
66
-        else {
65
+        } else {
67 66
             $schedule->sequence = null;
68 67
         }
69 68
 
Please login to merge, or discard this patch.