@@ -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 | |
@@ -62,8 +62,7 @@ |
||
| 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 | |
@@ -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'); |
@@ -13,8 +13,7 @@ discard block |
||
| 13 | 13 | public function admin() { |
| 14 | 14 | if (Bouncer::can('view-admin-pages')) { |
| 15 | 15 | return view('admin'); |
| 16 | - } |
|
| 17 | - else { |
|
| 16 | + } else { |
|
| 18 | 17 | return view('denied'); |
| 19 | 18 | } |
| 20 | 19 | } |
@@ -24,8 +23,7 @@ discard block |
||
| 24 | 23 | return view('admin.users', [ |
| 25 | 24 | 'users' => User::all(), |
| 26 | 25 | ]); |
| 27 | - } |
|
| 28 | - else { |
|
| 26 | + } else { |
|
| 29 | 27 | return view('denied'); |
| 30 | 28 | } |
| 31 | 29 | } |
@@ -35,8 +33,7 @@ discard block |
||
| 35 | 33 | $associations = Association::onlyTrashed()->get(); |
| 36 | 34 | |
| 37 | 35 | return view('admin.associations.trashed', ['associations' => $associations]); |
| 38 | - } |
|
| 39 | - else { |
|
| 36 | + } else { |
|
| 40 | 37 | return view('denied'); |
| 41 | 38 | } |
| 42 | 39 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | return redirect($url)->with('success', __('Data saved successfully!')); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 86 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | return redirect($url)->with('success', __('Data saved successfully!')); |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 150 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | public function deleteConfirm(Schedule $schedule, Round $round) { |
@@ -165,6 +165,6 @@ discard block |
||
| 165 | 165 | $round->delete(); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 168 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 169 | 169 | } |
| 170 | 170 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | return redirect($request->url)->with('success', 'Data saved successfully!'); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 32 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 33 | 33 | } |
| 34 | 34 | else { |
| 35 | 35 | return view('denied'); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function edit(Association $association, Venue $venue) { |
| 40 | 40 | if (Bouncer::can('edit', Venue::class)) { |
| 41 | - return view('venue.edit', ['venue' => $venue]); |
|
| 41 | + return view('venue.edit', [ 'venue' => $venue ]); |
|
| 42 | 42 | } |
| 43 | 43 | else { |
| 44 | 44 | return view('denied'); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public function update(Venue $venue, Request $request) { |
| 49 | 49 | if (Bouncer::can('update', Venue::class)) { |
| 50 | - $venue = Venue::where(['id' => $venue->id])->first(); |
|
| 50 | + $venue = Venue::where([ 'id' => $venue->id ])->first(); |
|
| 51 | 51 | |
| 52 | 52 | $venue->name = $request->name; |
| 53 | 53 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function deleteConfirm(Venue $venue) { |
| 68 | 68 | if (Bouncer::can('delete', $venue)) { |
| 69 | - return view('venue.delete', ['venue' => $venue]); |
|
| 69 | + return view('venue.delete', [ 'venue' => $venue ]); |
|
| 70 | 70 | } |
| 71 | 71 | else { |
| 72 | 72 | return view('denied'); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | $venue->delete(); |
| 81 | 81 | |
| 82 | - return redirect()->route('association.venues', ['association' => $association])->with('success', 'Venue deleted successfully.'); |
|
| 82 | + return redirect()->route('association.venues', [ 'association' => $association ])->with('success', 'Venue deleted successfully.'); |
|
| 83 | 83 | } |
| 84 | 84 | else { |
| 85 | 85 | return view('denied'); |
@@ -30,8 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | return redirect()->route('user', ['id' => \Auth::user()->id]); |
| 33 | - } |
|
| 34 | - else { |
|
| 33 | + } else { |
|
| 35 | 34 | return view('denied'); |
| 36 | 35 | } |
| 37 | 36 | } |
@@ -39,8 +38,7 @@ discard block |
||
| 39 | 38 | public function edit(Association $association, Venue $venue) { |
| 40 | 39 | if (Bouncer::can('edit', Venue::class)) { |
| 41 | 40 | return view('venue.edit', ['venue' => $venue]); |
| 42 | - } |
|
| 43 | - else { |
|
| 41 | + } else { |
|
| 44 | 42 | return view('denied'); |
| 45 | 43 | } |
| 46 | 44 | } |
@@ -58,8 +56,7 @@ discard block |
||
| 58 | 56 | } |
| 59 | 57 | |
| 60 | 58 | return redirect()->route('admin'); |
| 61 | - } |
|
| 62 | - else { |
|
| 59 | + } else { |
|
| 63 | 60 | return view('denied'); |
| 64 | 61 | } |
| 65 | 62 | } |
@@ -67,8 +64,7 @@ discard block |
||
| 67 | 64 | public function deleteConfirm(Venue $venue) { |
| 68 | 65 | if (Bouncer::can('delete', $venue)) { |
| 69 | 66 | return view('venue.delete', ['venue' => $venue]); |
| 70 | - } |
|
| 71 | - else { |
|
| 67 | + } else { |
|
| 72 | 68 | return view('denied'); |
| 73 | 69 | } |
| 74 | 70 | } |
@@ -80,8 +76,7 @@ discard block |
||
| 80 | 76 | $venue->delete(); |
| 81 | 77 | |
| 82 | 78 | return redirect()->route('association.venues', ['association' => $association])->with('success', 'Venue deleted successfully.'); |
| 83 | - } |
|
| 84 | - else { |
|
| 79 | + } else { |
|
| 85 | 80 | return view('denied'); |
| 86 | 81 | } |
| 87 | 82 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $series->save(); |
| 36 | 36 | |
| 37 | 37 | // TODO: Do not necessarily "onboard" for certain roles? |
| 38 | - return redirect()->route('onboard.series', ['series' => $series]); |
|
| 38 | + return redirect()->route('onboard.series', [ 'series' => $series ]); |
|
| 39 | 39 | |
| 40 | 40 | } |
| 41 | 41 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | $series->save(); |
| 93 | 93 | |
| 94 | - $request->session()->flash('message', __('Successfully updated series :series!', ['series' => $series->name])); |
|
| 94 | + $request->session()->flash('message', __('Successfully updated series :series!', [ 'series' => $series->name ])); |
|
| 95 | 95 | |
| 96 | 96 | $url = $request->url; |
| 97 | 97 | |
@@ -99,12 +99,12 @@ discard block |
||
| 99 | 99 | return redirect($url)->with('success', __('Data saved successfully!')); |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 102 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 103 | 103 | |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | public function schedules(Series $series) { |
| 107 | - return view('series.schedules', ['series' => $series]); |
|
| 107 | + return view('series.schedules', [ 'series' => $series ]); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | } |
@@ -75,8 +75,7 @@ discard block |
||
| 75 | 75 | //$start_date_timestamp = strtotime($request->start_date); |
| 76 | 76 | //$series->start_date = $start_date_timestamp; |
| 77 | 77 | $series->start_date = $request->start_date; |
| 78 | - } |
|
| 79 | - else { |
|
| 78 | + } else { |
|
| 80 | 79 | $series->start_date = NULL; |
| 81 | 80 | } |
| 82 | 81 | |
@@ -84,8 +83,7 @@ discard block |
||
| 84 | 83 | //$end_date_timestamp = strtotime($request->end_date); |
| 85 | 84 | //$series->end_date = $end_date_timestamp; |
| 86 | 85 | $series->end_date = $request->end_date; |
| 87 | - } |
|
| 88 | - else { |
|
| 86 | + } else { |
|
| 89 | 87 | $series->end_date = NULL; |
| 90 | 88 | } |
| 91 | 89 | |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | protected function validator(array $data) |
| 51 | 51 | { |
| 52 | 52 | return Validator::make($data, [ |
| 53 | - 'name' => ['required', 'string', 'max:255'], |
|
| 54 | - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], |
|
| 55 | - 'password' => ['required', 'string', 'min:8', 'confirmed'], |
|
| 53 | + 'name' => [ 'required', 'string', 'max:255' ], |
|
| 54 | + 'email' => [ 'required', 'string', 'email', 'max:255', 'unique:users' ], |
|
| 55 | + 'password' => [ 'required', 'string', 'min:8', 'confirmed' ], |
|
| 56 | 56 | ]); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -65,9 +65,9 @@ discard block |
||
| 65 | 65 | protected function create(array $data) |
| 66 | 66 | { |
| 67 | 67 | $user = User::create([ |
| 68 | - 'name' => $data['name'], |
|
| 69 | - 'email' => $data['email'], |
|
| 70 | - 'password' => Hash::make($data['password']), |
|
| 68 | + 'name' => $data[ 'name' ], |
|
| 69 | + 'email' => $data[ 'email' ], |
|
| 70 | + 'password' => Hash::make($data[ 'password' ]), |
|
| 71 | 71 | ]); |
| 72 | 72 | |
| 73 | 73 | Bouncer::assign('authenticated')->to($user); |
@@ -22,8 +22,7 @@ |
||
| 22 | 22 | 'associations' => $associations, |
| 23 | 23 | 'series' => $series, |
| 24 | 24 | ]); |
| 25 | - } |
|
| 26 | - else { |
|
| 25 | + } else { |
|
| 27 | 26 | return view('denied'); |
| 28 | 27 | } |
| 29 | 28 | } |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | class Match extends Model |
| 8 | 8 | { |
| 9 | 9 | |
| 10 | - protected $fillable = array('name', 'start_date', 'end_date', 'association_id', 'series_id', 'division_id', 'schedule_id', 'round_id', 'venue_id', 'home_team_id', 'away_team_id'); |
|
| 10 | + protected $fillable = array('name', 'start_date', 'end_date', 'association_id', 'series_id', 'division_id', 'schedule_id', 'round_id', 'venue_id', 'home_team_id', 'away_team_id'); |
|
| 11 | 11 | |
| 12 | 12 | public function association() { |
| 13 | 13 | return $this->belongsTo('App\Association'); |