@@ -35,7 +35,7 @@ |
||
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 | } |
@@ -14,7 +14,7 @@ |
||
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 | } |
@@ -15,7 +15,7 @@ |
||
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 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | return redirect($request->url)->with('success', 'Data saved successfully!'); |
31 | 31 | } |
32 | 32 | |
33 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
33 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
34 | 34 | } |
35 | 35 | else { |
36 | 36 | return view('denied'); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | public function update(Association $association, Team $team, Request $request) { |
41 | 41 | if (Bouncer::can('update', Team::class)) { |
42 | - $team = Team::where(['id' => $team->id])->first(); |
|
42 | + $team = Team::where([ 'id' => $team->id ])->first(); |
|
43 | 43 | |
44 | 44 | $team->name = $request->name; |
45 | 45 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | return redirect($request->url)->with('success', 'Data saved successfully!'); |
50 | 50 | } |
51 | 51 | |
52 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
52 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
53 | 53 | } |
54 | 54 | else { |
55 | 55 | return view('denied'); |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | public function edit(Association $association, Team $team) { |
60 | - return view('team.edit', ['team' => $team]); |
|
60 | + return view('team.edit', [ 'team' => $team ]); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | public function deleteConfirm(Association $association, Team $team) { |
64 | 64 | if (Bouncer::can('delete', $team)) { |
65 | - return view('team.delete', ['team' => $team]); |
|
65 | + return view('team.delete', [ 'team' => $team ]); |
|
66 | 66 | } |
67 | 67 | else { |
68 | 68 | return view('denied'); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | if (Bouncer::can('delete', $team)) { |
74 | 74 | $team->delete(); |
75 | 75 | |
76 | - return redirect()->route('association.teams', ['association' => $association])->with('success', 'Team deleted successfully.'); |
|
76 | + return redirect()->route('association.teams', [ 'association' => $association ])->with('success', 'Team deleted successfully.'); |
|
77 | 77 | } |
78 | 78 | else { |
79 | 79 | return view('denied'); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | return redirect($request->url)->with('success', 'Data saved successfully!'); |
31 | 31 | } |
32 | 32 | |
33 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
33 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
34 | 34 | } |
35 | 35 | else { |
36 | 36 | return view('denied'); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | return redirect($request->url)->with('success', 'Data saved successfully!'); |
50 | 50 | } |
51 | 51 | |
52 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
52 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
53 | 53 | } |
54 | 54 | else { |
55 | 55 | return view('denied'); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | public function deleteConfirm(Association $association, Division $division) { |
72 | 72 | if (Bouncer::can('delete', $division)) { |
73 | - return view('division.delete', ['division' => $division]); |
|
73 | + return view('division.delete', [ 'division' => $division ]); |
|
74 | 74 | } |
75 | 75 | else { |
76 | 76 | return view('denied'); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | if (Bouncer::can('delete', $division)) { |
82 | 82 | $division->delete(); |
83 | 83 | |
84 | - return redirect()->route('association.divisions', ['association' => $association])->with('success', 'Division deleted successfully.'); |
|
84 | + return redirect()->route('association.divisions', [ 'association' => $association ])->with('success', 'Division deleted successfully.'); |
|
85 | 85 | } |
86 | 86 | else { |
87 | 87 | return view('denied'); |
@@ -25,7 +25,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -16,7 +16,7 @@ discard block |
||
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 |
||
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 | /** |
@@ -14,13 +14,13 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | if (Bouncer::can('administer-associations')) { |
35 | 35 | $associations = Association::onlyTrashed()->get(); |
36 | 36 | |
37 | - return view('admin.associations.trashed', ['associations' => $associations]); |
|
37 | + return view('admin.associations.trashed', [ 'associations' => $associations ]); |
|
38 | 38 | } |
39 | 39 | else { |
40 | 40 | return view('denied'); |