@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $series->save(); |
| 39 | 39 | |
| 40 | - return redirect()->route('association.series', ['association' => Association::find($request->association_id)]); |
|
| 40 | + return redirect()->route('association.series', [ 'association' => Association::find($request->association_id) ]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function edit(Series $series) { |
@@ -95,13 +95,13 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | $series->save(); |
| 97 | 97 | |
| 98 | - $request->session()->flash('message', __('Successfully updated series :series!', ['series' => $series->name])); |
|
| 98 | + $request->session()->flash('message', __('Successfully updated series :series!', [ 'series' => $series->name ])); |
|
| 99 | 99 | |
| 100 | - return redirect()->route('series.view', ['series' => $series]); |
|
| 100 | + return redirect()->route('series.view', [ 'series' => $series ]); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | public function schedules(Series $series) { |
| 104 | - return view('series.schedules', ['series' => $series]); |
|
| 104 | + return view('series.schedules', [ 'series' => $series ]); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $match->save(); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 85 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | $request->session()->flash('message', __('Successfully updated round')); |
| 141 | 141 | |
| 142 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 142 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | public function deleteConfirm(Schedule $schedule, Round $round) { |
@@ -157,6 +157,6 @@ discard block |
||
| 157 | 157 | $round->delete(); |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 160 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 161 | 161 | } |
| 162 | 162 | } |
@@ -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, |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $schedule->start_date = $start_date; |
| 65 | 65 | $schedule->end_date = $end_date; |
| 66 | 66 | |
| 67 | - $division = Division::where(['id' => $division_id])->first(); |
|
| 67 | + $division = Division::where([ 'id' => $division_id ])->first(); |
|
| 68 | 68 | |
| 69 | 69 | if (!empty($division)) { |
| 70 | 70 | $schedule->name = $division->name; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | $days = $days_interval->format('%a'); |
| 86 | 86 | |
| 87 | - $association = Association::where(['id' => $association_id])->first(); |
|
| 87 | + $association = Association::where([ 'id' => $association_id ])->first(); |
|
| 88 | 88 | $venues = $association->venues; |
| 89 | 89 | |
| 90 | 90 | $round_number = 1; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $start_datetime->add(new \DateInterval('P1D')); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - return redirect()->route('series.schedules', ['series' => $series]); |
|
| 132 | + return redirect()->route('series.schedules', [ 'series' => $series ]); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | public function update(Request $request) { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | $request->session()->flash('message', __('Successfully updated schedule')); |
| 160 | 160 | |
| 161 | - return redirect()->route('schedule.view', ['schedule' => $schedule]); |
|
| 161 | + return redirect()->route('schedule.view', [ 'schedule' => $schedule ]); |
|
| 162 | 162 | |
| 163 | 163 | } |
| 164 | 164 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | public function activeRounds() { |
| 47 | 47 | return $this->rounds() |
| 48 | 48 | ->where('rounds.start_date', '>=', date('Y-m-d', strtotime('today -7 days'))) |
| 49 | - ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days')) ); |
|
| 49 | + ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days'))); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public function users() { |
@@ -21,6 +21,6 @@ |
||
| 21 | 21 | 'api_token' => hash('sha256', $token), |
| 22 | 22 | ])->save(); |
| 23 | 23 | |
| 24 | - return ['token' => $token]; |
|
| 24 | + return [ 'token' => $token ]; |
|
| 25 | 25 | } |
| 26 | 26 | } |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | public function index(Request $request) { |
| 34 | 34 | $user = $request->user(); |
| 35 | 35 | |
| 36 | - $userAssociations = Association::all()->filter(function ($association) { |
|
| 36 | + $userAssociations = Association::all()->filter(function($association) { |
|
| 37 | 37 | return Bouncer::can('manage', $association); |
| 38 | 38 | }); |
| 39 | 39 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | |
| 12 | 12 | public function view(Association $association, ContactSubmission $contactSubmission) { |
| 13 | - return view('contact_submission.view', ['association' => $association, 'contactSubmission' => $contactSubmission]); |
|
| 13 | + return view('contact_submission.view', [ 'association' => $association, 'contactSubmission' => $contactSubmission ]); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function archive(Request $request, Association $association, ContactSubmission $contactSubmission) { |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $contactSubmission->save(); |
| 20 | 20 | |
| 21 | - return redirect()->route('contact_submissions.list', ['association' => $association]); |
|
| 21 | + return redirect()->route('contact_submissions.list', [ 'association' => $association ]); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | public function view(Association $association) { |
| 29 | - return view('association.view', ['association' => $association]); |
|
| 29 | + return view('association.view', [ 'association' => $association ]); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function edit(Association $association) { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | public function home() { |
| 48 | 48 | if (!empty($this->association)) { |
| 49 | - return view('association.home', ['association' => $this->association]); |
|
| 49 | + return view('association.home', [ 'association' => $this->association ]); |
|
| 50 | 50 | } |
| 51 | 51 | else { |
| 52 | 52 | abort(404); |
@@ -54,35 +54,35 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function divisions(Association $association) { |
| 57 | - return view('association.divisions', ['association' => $association]); |
|
| 57 | + return view('association.divisions', [ 'association' => $association ]); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function teams(Association $association) { |
| 61 | - return view('association.teams', ['association' => $association]); |
|
| 61 | + return view('association.teams', [ 'association' => $association ]); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function venues(Association $association) { |
| 65 | - return view('association.venues', ['association' => $association]); |
|
| 65 | + return view('association.venues', [ 'association' => $association ]); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | public function series(Association $association) { |
| 69 | - return view('association.series', ['association' => $association]); |
|
| 69 | + return view('association.series', [ 'association' => $association ]); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function users(Association $association) { |
| 73 | - return view('association.users', ['association' => $association]); |
|
| 73 | + return view('association.users', [ 'association' => $association ]); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public function viewUser(Association $association, User $user) { |
| 77 | - return view('association.user.view', ['association' => $association, 'user' => $user]); |
|
| 77 | + return view('association.user.view', [ 'association' => $association, 'user' => $user ]); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | public function editUser(Association $association, User $user) { |
| 81 | - return view('association.user.edit', ['association' => $association, 'user' => $user]); |
|
| 81 | + return view('association.user.edit', [ 'association' => $association, 'user' => $user ]); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | public function userToken(Association $association, User $user) { |
| 85 | - return view('association.user.token', ['association' => $association, 'user' => $user]); |
|
| 85 | + return view('association.user.token', [ 'association' => $association, 'user' => $user ]); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | public function userTokenRefresh(Association $association, User $user) { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | 'api_token' => hash('sha256', $token), |
| 93 | 93 | ])->save(); |
| 94 | 94 | |
| 95 | - return view('association.user.token-refresh', ['association' => $association, 'user' => $user, 'token' => $token]); |
|
| 95 | + return view('association.user.token-refresh', [ 'association' => $association, 'user' => $user, 'token' => $token ]); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | public function updateUser(Request $request, Association $association, User $user) { |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | return redirect($url)->with('success', 'Data saved successfully!'); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 115 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 116 | 116 | |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | public function addUser(Association $association) { |
| 120 | - return view('association.user.add', ['association' => $association]); |
|
| 120 | + return view('association.user.add', [ 'association' => $association ]); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | public function submitScoreBegin(Request $request) { |
@@ -129,13 +129,13 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | // get rounds with start_date < today, but greater than today - 1 week |
| 131 | 131 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
| 132 | - ->where('start_date','>=', date('Y-m-d', strtotime('-1 week'))) |
|
| 132 | + ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
|
| 133 | 133 | ->where('start_date', '<=', date('Y-m-d', strtotime("today")))->get(); |
| 134 | 134 | |
| 135 | 135 | $divisions = Division::whereIn('id', $rounds->pluck('division_id'))->get(); |
| 136 | 136 | |
| 137 | 137 | if (count($divisions) === 1) { |
| 138 | - $request->division_id = $divisions[0]->id; |
|
| 138 | + $request->division_id = $divisions[ 0 ]->id; |
|
| 139 | 139 | |
| 140 | 140 | return $this->submitScoreStep2($request); |
| 141 | 141 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
| 166 | 166 | ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
| 167 | 167 | ->where('start_date', '<=', date('Y-m-d', strtotime("today"))) |
| 168 | - ->where(function ($query) { |
|
| 168 | + ->where(function($query) { |
|
| 169 | 169 | $query->where('scores_closed', 0); |
| 170 | 170 | $query->orWhereNull('scores_closed'); |
| 171 | 171 | }) |
@@ -264,11 +264,11 @@ discard block |
||
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | public function standings() { |
| 267 | - return view('association.standings', ['association' => $this->association]); |
|
| 267 | + return view('association.standings', [ 'association' => $this->association ]); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | public function schedule() { |
| 271 | - return view('association.schedule', ['association' => $this->association]); |
|
| 271 | + return view('association.schedule', [ 'association' => $this->association ]); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | public function css() { |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | $association->save(); |
| 294 | 294 | |
| 295 | 295 | // TODO: Do not necessarily "onboard" for certain roles? |
| 296 | - return redirect()->route('onboard.association', ['association' => $association]); |
|
| 296 | + return redirect()->route('onboard.association', [ 'association' => $association ]); |
|
| 297 | 297 | } |
| 298 | 298 | else { |
| 299 | 299 | return view('denied'); |
@@ -331,13 +331,13 @@ discard block |
||
| 331 | 331 | return redirect($url)->with('success', 'Data saved successfully!'); |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 334 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 335 | 335 | |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | public function create() { |
| 339 | 339 | if (Bouncer::can('create', Association::class)) { |
| 340 | - return view('association.create', ['current_user' => \Auth::user()]); |
|
| 340 | + return view('association.create', [ 'current_user' => \Auth::user() ]); |
|
| 341 | 341 | } |
| 342 | 342 | else { |
| 343 | 343 | return view('denied'); |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | public function deleteConfirm(Association $association) { |
| 348 | - return view('association.delete', ['association' => $association]); |
|
| 348 | + return view('association.delete', [ 'association' => $association ]); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | public function delete(Association $association) { |
@@ -355,21 +355,21 @@ discard block |
||
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | public function undeleteConfirm(Association $association) { |
| 358 | - return view('association.undelete', ['association' => $association]); |
|
| 358 | + return view('association.undelete', [ 'association' => $association ]); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | public function undelete(Association $association) { |
| 362 | 362 | $association->restore(); |
| 363 | 363 | |
| 364 | - return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.'); |
|
| 364 | + return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.'); |
|
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | public function about() { |
| 368 | - return view('association.about' , ['association' => $this->association]); |
|
| 368 | + return view('association.about', [ 'association' => $this->association ]); |
|
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | public function contact() { |
| 372 | - return view('forms.contact', ['association' => $this->association]); |
|
| 372 | + return view('forms.contact', [ 'association' => $this->association ]); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | public function contactSubmit(Request $request) { |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | public function contactSubmissions(Association $association) |
| 402 | 402 | { |
| 403 | - return view('association.contact_submissions', ['association' => $association]); |
|
| 403 | + return view('association.contact_submissions', [ 'association' => $association ]); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | } |