@@ -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'); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $division->save(); |
| 32 | 32 | |
| 33 | - return redirect()->route('association.divisions', ['association' => $association]); |
|
| 33 | + return redirect()->route('association.divisions', [ 'association' => $association ]); |
|
| 34 | 34 | } |
| 35 | 35 | else { |
| 36 | 36 | return view('denied'); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | $division->save(); |
| 51 | 51 | |
| 52 | - return redirect()->route('association.divisions', ['association' => $association]); |
|
| 52 | + return redirect()->route('association.divisions', [ 'association' => $association ]); |
|
| 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'); |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | $division->save(); |
| 32 | 32 | |
| 33 | 33 | return redirect()->route('association.divisions', ['association' => $association]); |
| 34 | - } |
|
| 35 | - else { |
|
| 34 | + } else { |
|
| 36 | 35 | return view('denied'); |
| 37 | 36 | } |
| 38 | 37 | } |
@@ -50,8 +49,7 @@ discard block |
||
| 50 | 49 | $division->save(); |
| 51 | 50 | |
| 52 | 51 | return redirect()->route('association.divisions', ['association' => $association]); |
| 53 | - } |
|
| 54 | - else { |
|
| 52 | + } else { |
|
| 55 | 53 | return view('denied'); |
| 56 | 54 | } |
| 57 | 55 | } |
@@ -62,8 +60,7 @@ discard block |
||
| 62 | 60 | 'association' => $association, |
| 63 | 61 | 'division' => $division, |
| 64 | 62 | ]); |
| 65 | - } |
|
| 66 | - else { |
|
| 63 | + } else { |
|
| 67 | 64 | return view('denied'); |
| 68 | 65 | } |
| 69 | 66 | } |
@@ -71,8 +68,7 @@ discard block |
||
| 71 | 68 | public function deleteConfirm(Association $association, Division $division) { |
| 72 | 69 | if (Bouncer::can('delete', $division)) { |
| 73 | 70 | return view('division.delete', ['division' => $division]); |
| 74 | - } |
|
| 75 | - else { |
|
| 71 | + } else { |
|
| 76 | 72 | return view('denied'); |
| 77 | 73 | } |
| 78 | 74 | } |
@@ -82,8 +78,7 @@ discard block |
||
| 82 | 78 | $division->delete(); |
| 83 | 79 | |
| 84 | 80 | return redirect()->route('association.divisions', ['association' => $association])->with('success', 'Division deleted successfully.'); |
| 85 | - } |
|
| 86 | - else { |
|
| 81 | + } else { |
|
| 87 | 82 | return view('denied'); |
| 88 | 83 | } |
| 89 | 84 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $team->save(); |
| 32 | 32 | |
| 33 | - return redirect()->route('association.teams', ['association' => $association]); |
|
| 33 | + return redirect()->route('association.teams', [ 'association' => $association ]); |
|
| 34 | 34 | } |
| 35 | 35 | else { |
| 36 | 36 | return view('denied'); |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | 'name' => 'required|max:255', |
| 44 | 44 | ]); |
| 45 | 45 | |
| 46 | - $team = Team::where(['id' => $team->id])->first(); |
|
| 46 | + $team = Team::where([ 'id' => $team->id ])->first(); |
|
| 47 | 47 | |
| 48 | 48 | $team->name = $request->name; |
| 49 | 49 | $team->venue_id = !empty($request->venue_id) ? $request->venue_id : null; |
| 50 | 50 | |
| 51 | 51 | $team->save(); |
| 52 | 52 | |
| 53 | - return redirect()->route('association.teams', ['association' => $team->association]); |
|
| 53 | + return redirect()->route('association.teams', [ 'association' => $team->association ]); |
|
| 54 | 54 | } |
| 55 | 55 | else { |
| 56 | 56 | return view('denied'); |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function edit(Association $association, Team $team) { |
| 61 | - return view('team.edit', ['team' => $team]); |
|
| 61 | + return view('team.edit', [ 'team' => $team ]); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function deleteConfirm(Association $association, Team $team) { |
| 65 | 65 | if (Bouncer::can('delete', $team)) { |
| 66 | - return view('team.delete', ['team' => $team]); |
|
| 66 | + return view('team.delete', [ 'team' => $team ]); |
|
| 67 | 67 | } |
| 68 | 68 | else { |
| 69 | 69 | return view('denied'); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | if (Bouncer::can('delete', $team)) { |
| 75 | 75 | $team->delete(); |
| 76 | 76 | |
| 77 | - return redirect()->route('association.teams', ['association' => $association])->with('success', 'Team deleted successfully.'); |
|
| 77 | + return redirect()->route('association.teams', [ 'association' => $association ])->with('success', 'Team deleted successfully.'); |
|
| 78 | 78 | } |
| 79 | 79 | else { |
| 80 | 80 | return view('denied'); |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | $team->save(); |
| 32 | 32 | |
| 33 | 33 | return redirect()->route('association.teams', ['association' => $association]); |
| 34 | - } |
|
| 35 | - else { |
|
| 34 | + } else { |
|
| 36 | 35 | return view('denied'); |
| 37 | 36 | } |
| 38 | 37 | } |
@@ -51,8 +50,7 @@ discard block |
||
| 51 | 50 | $team->save(); |
| 52 | 51 | |
| 53 | 52 | return redirect()->route('association.teams', ['association' => $team->association]); |
| 54 | - } |
|
| 55 | - else { |
|
| 53 | + } else { |
|
| 56 | 54 | return view('denied'); |
| 57 | 55 | } |
| 58 | 56 | } |
@@ -64,8 +62,7 @@ discard block |
||
| 64 | 62 | public function deleteConfirm(Association $association, Team $team) { |
| 65 | 63 | if (Bouncer::can('delete', $team)) { |
| 66 | 64 | return view('team.delete', ['team' => $team]); |
| 67 | - } |
|
| 68 | - else { |
|
| 65 | + } else { |
|
| 69 | 66 | return view('denied'); |
| 70 | 67 | } |
| 71 | 68 | } |
@@ -75,8 +72,7 @@ discard block |
||
| 75 | 72 | $team->delete(); |
| 76 | 73 | |
| 77 | 74 | return redirect()->route('association.teams', ['association' => $association])->with('success', 'Team deleted successfully.'); |
| 78 | - } |
|
| 79 | - else { |
|
| 75 | + } else { |
|
| 80 | 76 | return view('denied'); |
| 81 | 77 | } |
| 82 | 78 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $venue->save(); |
| 31 | 31 | |
| 32 | - return redirect()->route('association.venues', ['association' => $association]); |
|
| 32 | + return redirect()->route('association.venues', [ 'association' => $association ]); |
|
| 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'); |
@@ -51,13 +51,13 @@ discard block |
||
| 51 | 51 | 'name' => 'required|max:255', |
| 52 | 52 | ]); |
| 53 | 53 | |
| 54 | - $venue = Venue::where(['id' => $venue->id])->first(); |
|
| 54 | + $venue = Venue::where([ 'id' => $venue->id ])->first(); |
|
| 55 | 55 | |
| 56 | 56 | $venue->name = $request->name; |
| 57 | 57 | |
| 58 | 58 | $venue->save(); |
| 59 | 59 | |
| 60 | - return redirect()->route('association.venues', ['association' => $venue->association]); |
|
| 60 | + return redirect()->route('association.venues', [ 'association' => $venue->association ]); |
|
| 61 | 61 | } |
| 62 | 62 | else { |
| 63 | 63 | return view('denied'); |
@@ -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 | $venue->save(); |
| 31 | 31 | |
| 32 | 32 | return redirect()->route('association.venues', ['association' => $association]); |
| 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 | $venue->save(); |
| 59 | 57 | |
| 60 | 58 | return redirect()->route('association.venues', ['association' => $venue->association]); |
| 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 | } |
@@ -63,8 +63,7 @@ |
||
| 63 | 63 | if (!empty($division)) { |
| 64 | 64 | $schedule->name = $division->name; |
| 65 | 65 | $schedule->sequence = $division->sequence; |
| 66 | - } |
|
| 67 | - else { |
|
| 66 | + } else { |
|
| 68 | 67 | $schedule->name = $schedule->start_date; |
| 69 | 68 | $schedule->sequence = null; |
| 70 | 69 | } |
@@ -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 | |
@@ -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 | } |