@@ -1,6 +1,7 @@ |
||
| 1 | 1 | <?php namespace BB\Events; |
| 2 | 2 | |
| 3 | -abstract class Event { |
|
| 3 | +abstract class Event |
|
| 4 | +{ |
|
| 4 | 5 | |
| 5 | 6 | // |
| 6 | 7 | |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | abstract class Request extends FormRequest { |
| 6 | 6 | |
| 7 | - // |
|
| 7 | + // |
|
| 8 | 8 | |
| 9 | 9 | } |
@@ -9,43 +9,43 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | class Handler extends ExceptionHandler { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * A list of the exception types that should not be reported. |
|
| 14 | - * |
|
| 15 | - * @var array |
|
| 16 | - */ |
|
| 17 | - protected $dontReport = [ |
|
| 12 | + /** |
|
| 13 | + * A list of the exception types that should not be reported. |
|
| 14 | + * |
|
| 15 | + * @var array |
|
| 16 | + */ |
|
| 17 | + protected $dontReport = [ |
|
| 18 | 18 | HttpException::class, |
| 19 | 19 | NotFoundHttpException::class, |
| 20 | 20 | ModelNotFoundException::class, |
| 21 | 21 | MethodNotAllowedHttpException::class, |
| 22 | 22 | FormValidationException::class, |
| 23 | 23 | AuthenticationException::class, //These are logged separately below |
| 24 | - ]; |
|
| 24 | + ]; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Report or log an exception. |
|
| 28 | - * |
|
| 29 | - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 30 | - * |
|
| 31 | - * @param \Exception $e |
|
| 32 | - * @return void |
|
| 33 | - */ |
|
| 34 | - public function report(Exception $e) |
|
| 35 | - { |
|
| 26 | + /** |
|
| 27 | + * Report or log an exception. |
|
| 28 | + * |
|
| 29 | + * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 30 | + * |
|
| 31 | + * @param \Exception $e |
|
| 32 | + * @return void |
|
| 33 | + */ |
|
| 34 | + public function report(Exception $e) |
|
| 35 | + { |
|
| 36 | 36 | //The parent will log exceptions that aren't of the types above |
| 37 | - parent::report($e); |
|
| 38 | - } |
|
| 37 | + parent::report($e); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Render an exception into an HTTP response. |
|
| 42 | - * |
|
| 43 | - * @param \Illuminate\Http\Request $request |
|
| 44 | - * @param \Exception $e |
|
| 45 | - * @return \Illuminate\Http\Response |
|
| 46 | - */ |
|
| 47 | - public function render($request, Exception $e) |
|
| 48 | - { |
|
| 40 | + /** |
|
| 41 | + * Render an exception into an HTTP response. |
|
| 42 | + * |
|
| 43 | + * @param \Illuminate\Http\Request $request |
|
| 44 | + * @param \Exception $e |
|
| 45 | + * @return \Illuminate\Http\Response |
|
| 46 | + */ |
|
| 47 | + public function render($request, Exception $e) |
|
| 48 | + { |
|
| 49 | 49 | if ($e instanceof FormValidationException) { |
| 50 | 50 | if ($request->wantsJson()) { |
| 51 | 51 | return \Response::json($e->getErrors(), 422); |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | return \Response::json(['error' => $e->getMessage()], $e->getStatusCode()); |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | - return parent::render($request, $e); |
|
| 96 | - } |
|
| 95 | + return parent::render($request, $e); |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | 99 | * Render an exception using Whoops. |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | ModelNotFoundException::class, |
| 21 | 21 | MethodNotAllowedHttpException::class, |
| 22 | 22 | FormValidationException::class, |
| 23 | - AuthenticationException::class, //These are logged separately below |
|
| 23 | + AuthenticationException::class, //These are logged separately below |
|
| 24 | 24 | ]; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | if ($e instanceof NotImplementedException) { |
| 66 | - \Notification::error("NotImplementedException: ".$e->getMessage()); |
|
| 66 | + \Notification::error("NotImplementedException: " . $e->getMessage()); |
|
| 67 | 67 | \Log::warning($e); |
| 68 | 68 | return redirect()->back()->withInput(); |
| 69 | 69 | } |
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | if ($request->wantsJson()) { |
| 73 | 73 | return \Response::json(['error' => $e->getMessage()], 403); |
| 74 | 74 | } |
| 75 | - $userString = \Auth::guest() ? "A guest": \Auth::user()->name; |
|
| 76 | - \Log::warning($userString." tried to access something they weren't supposed to."); |
|
| 75 | + $userString = \Auth::guest() ? "A guest" : \Auth::user()->name; |
|
| 76 | + \Log::warning($userString . " tried to access something they weren't supposed to."); |
|
| 77 | 77 | |
| 78 | 78 | return \Response::view('errors.403', [], 403); |
| 79 | 79 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $e = new HttpException(404, $e->getMessage()); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - if (config('app.debug') && $this->shouldReport($e) && !$request->wantsJson()) |
|
| 85 | + if (config('app.debug') && $this->shouldReport($e) && ! $request->wantsJson()) |
|
| 86 | 86 | { |
| 87 | 87 | return $this->renderExceptionWithWhoops($e); |
| 88 | 88 | } |
@@ -7,7 +7,8 @@ discard block |
||
| 7 | 7 | use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; |
| 8 | 8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 9 | 9 | |
| 10 | -class Handler extends ExceptionHandler { |
|
| 10 | +class Handler extends ExceptionHandler |
|
| 11 | +{ |
|
| 11 | 12 | |
| 12 | 13 | /** |
| 13 | 14 | * A list of the exception types that should not be reported. |
@@ -82,8 +83,7 @@ discard block |
||
| 82 | 83 | $e = new HttpException(404, $e->getMessage()); |
| 83 | 84 | } |
| 84 | 85 | |
| 85 | - if (config('app.debug') && $this->shouldReport($e) && !$request->wantsJson()) |
|
| 86 | - { |
|
| 86 | + if (config('app.debug') && $this->shouldReport($e) && !$request->wantsJson()) { |
|
| 87 | 87 | return $this->renderExceptionWithWhoops($e); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | function __construct(ACSNodeRepository $acsNodeRepository, KeyFobAccess $keyFobAccess, PaymentRepository $paymentRepository) |
| 25 | 25 | { |
| 26 | 26 | $this->acsNodeRepository = $acsNodeRepository; |
| 27 | - $this->keyFobAccess = $keyFobAccess; |
|
| 27 | + $this->keyFobAccess = $keyFobAccess; |
|
| 28 | 28 | $this->paymentRepository = $paymentRepository; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | class AuthController extends Controller { |
| 9 | 9 | |
| 10 | - /* |
|
| 10 | + /* |
|
| 11 | 11 | |-------------------------------------------------------------------------- |
| 12 | 12 | | Registration & Login Controller |
| 13 | 13 | |-------------------------------------------------------------------------- |
@@ -18,21 +18,21 @@ discard block |
||
| 18 | 18 | | |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | - use AuthenticatesAndRegistersUsers; |
|
| 21 | + use AuthenticatesAndRegistersUsers; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Create a new authentication controller instance. |
|
| 25 | - * |
|
| 26 | - * @param \Illuminate\Contracts\Auth\Guard $auth |
|
| 27 | - * @param \Illuminate\Contracts\Auth\Registrar $registrar |
|
| 28 | - * @return void |
|
| 29 | - */ |
|
| 30 | - public function __construct(Guard $auth, Registrar $registrar) |
|
| 31 | - { |
|
| 32 | - $this->auth = $auth; |
|
| 33 | - $this->registrar = $registrar; |
|
| 23 | + /** |
|
| 24 | + * Create a new authentication controller instance. |
|
| 25 | + * |
|
| 26 | + * @param \Illuminate\Contracts\Auth\Guard $auth |
|
| 27 | + * @param \Illuminate\Contracts\Auth\Registrar $registrar |
|
| 28 | + * @return void |
|
| 29 | + */ |
|
| 30 | + public function __construct(Guard $auth, Registrar $registrar) |
|
| 31 | + { |
|
| 32 | + $this->auth = $auth; |
|
| 33 | + $this->registrar = $registrar; |
|
| 34 | 34 | |
| 35 | - $this->middleware('guest', ['except' => 'getLogout']); |
|
| 36 | - } |
|
| 35 | + $this->middleware('guest', ['except' => 'getLogout']); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -5,7 +5,8 @@ |
||
| 5 | 5 | use Illuminate\Contracts\Auth\Registrar; |
| 6 | 6 | use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; |
| 7 | 7 | |
| 8 | -class AuthController extends Controller { |
|
| 8 | +class AuthController extends Controller |
|
| 9 | +{ |
|
| 9 | 10 | |
| 10 | 11 | /* |
| 11 | 12 | |-------------------------------------------------------------------------- |
@@ -6,6 +6,6 @@ |
||
| 6 | 6 | |
| 7 | 7 | abstract class Controller extends BaseController { |
| 8 | 8 | |
| 9 | - use DispatchesCommands, ValidatesRequests; |
|
| 9 | + use DispatchesCommands, ValidatesRequests; |
|
| 10 | 10 | |
| 11 | 11 | } |
@@ -4,7 +4,8 @@ |
||
| 4 | 4 | use Illuminate\Routing\Controller as BaseController; |
| 5 | 5 | use Illuminate\Foundation\Validation\ValidatesRequests; |
| 6 | 6 | |
| 7 | -abstract class Controller extends BaseController { |
|
| 7 | +abstract class Controller extends BaseController |
|
| 8 | +{ |
|
| 8 | 9 | |
| 9 | 10 | use DispatchesCommands, ValidatesRequests; |
| 10 | 11 | |
@@ -225,7 +225,7 @@ |
||
| 225 | 225 | |
| 226 | 226 | $equipment->addPhoto($newFilename); |
| 227 | 227 | |
| 228 | - } catch(\Exception $e) { |
|
| 228 | + } catch (\Exception $e) { |
|
| 229 | 229 | \Log::error($e); |
| 230 | 230 | throw new ImageFailedException($e->getMessage()); |
| 231 | 231 | } |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $fob = KeyFob::findOrFail($id); |
| 70 | 70 | $fob->markLost(); |
| 71 | 71 | \Notification::success("Key Fob marked as lost/broken"); |
| 72 | - return \Redirect::route('account.show',$fob->user_id); |
|
| 72 | + return \Redirect::route('account.show', $fob->user_id); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | public function index() |
| 34 | 34 | { |
| 35 | - $users = $this->userRepository->getActivePublicList(!\Auth::guest()); |
|
| 35 | + $users = $this->userRepository->getActivePublicList( ! \Auth::guest()); |
|
| 36 | 36 | return \View::make('members.index')->withUsers($users); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | { |
| 266 | 266 | $user = User::findWithPermission($userId); |
| 267 | 267 | |
| 268 | - if ( ! \Auth::user()->hasRole('admin') && ! \Auth::user()->hasRole('finance')) { |
|
| 268 | + if ( ! \Auth::user()->hasRole('admin') && ! \Auth::user()->hasRole('finance')) { |
|
| 269 | 269 | throw new \BB\Exceptions\AuthenticationException; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - \Log::debug('Manual payment endpoint getting hit. account/{id}/payment. paymentController@store '.json_encode(\Input::all())); |
|
| 272 | + \Log::debug('Manual payment endpoint getting hit. account/{id}/payment. paymentController@store ' . json_encode(\Input::all())); |
|
| 273 | 273 | |
| 274 | 274 | $reason = \Input::get('reason'); |
| 275 | 275 | |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | { |
| 408 | 408 | $payment = $this->paymentRepository->getById($paymentId); |
| 409 | 409 | |
| 410 | - switch($request->get('change')) { |
|
| 410 | + switch ($request->get('change')) { |
|
| 411 | 411 | case 'assign-unknown-to-user': |
| 412 | 412 | $newUserId = $request->get('user_id'); |
| 413 | 413 | try { |