@@ -53,8 +53,8 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -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 | } |
@@ -28,8 +28,7 @@ |
||
| 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 | } |
@@ -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 | } |
@@ -37,8 +37,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -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 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
| 147 | 147 | ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
| 148 | 148 | ->where('start_date', '<=', date('Y-m-d', strtotime("today"))) |
| 149 | - ->where(function ($query) { |
|
| 149 | + ->where(function($query) { |
|
| 150 | 150 | $query->where('scores_closed', 0); |
| 151 | 151 | $query->orWhereNull('scores_closed'); |
| 152 | 152 | }) |
@@ -210,11 +210,11 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | public function standings() { |
| 213 | - return view('association.standings', ['association' => $this->association]); |
|
| 213 | + return view('association.standings', [ 'association' => $this->association ]); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | public function schedule() { |
| 217 | - return view('association.schedule', ['association' => $this->association]); |
|
| 217 | + return view('association.schedule', [ 'association' => $this->association ]); |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | public function css() { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $association->save(); |
| 240 | 240 | |
| 241 | 241 | // TODO: Do not necessarily "onboard" for certain roles? |
| 242 | - return redirect()->route('onboard.association', ['association' => $association]); |
|
| 242 | + return redirect()->route('onboard.association', [ 'association' => $association ]); |
|
| 243 | 243 | } |
| 244 | 244 | else { |
| 245 | 245 | return view('denied'); |
@@ -275,13 +275,13 @@ discard block |
||
| 275 | 275 | return redirect($url)->with('success', 'Data saved successfully!'); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 278 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 279 | 279 | |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | public function create() { |
| 283 | 283 | if (Bouncer::can('create', Association::class)) { |
| 284 | - return view('association.create', ['current_user' => \Auth::user()]); |
|
| 284 | + return view('association.create', [ 'current_user' => \Auth::user() ]); |
|
| 285 | 285 | } |
| 286 | 286 | else { |
| 287 | 287 | return view('denied'); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | public function deleteConfirm(Association $association) { |
| 292 | - return view('association.delete', ['association' => $association]); |
|
| 292 | + return view('association.delete', [ 'association' => $association ]); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | public function delete(Association $association) { |
@@ -299,13 +299,13 @@ discard block |
||
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | public function undeleteConfirm(Association $association) { |
| 302 | - return view('association.undelete', ['association' => $association]); |
|
| 302 | + return view('association.undelete', [ 'association' => $association ]); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | public function undelete(Association $association) { |
| 306 | 306 | $association->restore(); |
| 307 | 307 | |
| 308 | - return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.'); |
|
| 308 | + return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.'); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | |
@@ -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 | /** |
@@ -75,8 +75,7 @@ |
||
| 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)) { |
@@ -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 | } |
@@ -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 | |
@@ -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 | } |