Separate commit for error handler.

app/Exceptions/Handler.php

@@ -1,128 +1,53 @@
 <?php
-/**
- * Handler.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types=1);
 
 namespace FireflyIII\Exceptions;
 
-use ErrorException;
 use Exception;
-use FireflyIII\Jobs\MailError;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Session\TokenMismatchException;
-use Illuminate\Validation\ValidationException as ValException;
-use Request;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
-/**
- * Class Handler
- *
- * @package FireflyIII\Exceptions
- */
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of the exception types that should not be reported.
+     * A list of the exception types that are not reported.
      *
      * @var array
      */
-    protected $dontReport
+    protected $dontReport = [
-        = [
+        //
-            AuthenticationException::class,
+    ];
-            AuthorizationException::class,
-            HttpException::class,
-            ModelNotFoundException::class,
-            TokenMismatchException::class,
-            ValException::class,
-        ];
 
     /**
-     * Render an exception into an HTTP response.
+     * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @var array
-     * @param  \Exception               $exception
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    protected $dontFlash = [
-    {
+        'password',
-        if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
+        'password_confirmation',
-
+    ];
-            $isDebug = env('APP_DEBUG', false);
-
-            return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500);
-        }
-
-        return parent::render($request, $exception);
-    }
-
 
     /**
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  Exception $exception
+     * @param  \Exception  $exception
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
-     *
      * @return void
      */
     public function report(Exception $exception)
     {
-        $doMailError = env('SEND_ERROR_MESSAGE', true);
-        if (($exception instanceof FireflyException || $exception instanceof ErrorException) && $doMailError) {
-            $userData = [
-                'id'    => 0,
-                'email' => 'unknown@example.com',
-            ];
-            if (auth()->check()) {
-                $userData['id']    = auth()->user()->id;
-                $userData['email'] = auth()->user()->email;
-            }
-            $data = [
-                'class'        => get_class($exception),
-                'errorMessage' => $exception->getMessage(),
-                'time'         => date('r'),
-                'stackTrace'   => $exception->getTraceAsString(),
-                'file'         => $exception->getFile(),
-                'line'         => $exception->getLine(),
-                'code'         => $exception->getCode(),
-                'version'      => config('firefly.version'),
-            ];
-
-            // create job that will mail.
-            $ipAddress = Request::ip() ?? '0.0.0.0';
-            $job       = new MailError($userData, env('SITE_OWNER', ''), $ipAddress, $data);
-            dispatch($job);
-        }
-
         parent::report($exception);
     }
 
     /**
-     * Convert an authentication exception into an unauthenticated response.
+     * Render an exception into an HTTP response.
      *
-     * @param $request
+     * @param  \Illuminate\Http\Request  $request
-     *
+     * @param  \Exception  $exception
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\Response
      */
-    protected function unauthenticated($request)
+    public function render($request, Exception $exception)
     {
-        if ($request->expectsJson()) {
+        return parent::render($request, $exception);
-            return response()->json(['error' => 'Unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
     }
 }