Fixed issues with larave 5.3+

Specifically removed the session stuff since the addition of the web middleware, sessions aren't enabled anywhere else.
LithiumHosting · Jan 27, 2017 · 603641e · 603641e
1 parent ddc077b
commit 603641e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 28 deletions.
diff --git a/src/LithiumDev/ExceptionMailer/ExceptionHandler.php b/src/LithiumDev/ExceptionMailer/ExceptionHandler.php
@@ -1,17 +1,16 @@
 <?php
-
 namespace LithiumDev\ExceptionMailer;
 
-use App;
+
 use Exception;
 use App\Exceptions\Handler;
 
-class ExceptionHandler extends Handler
-{
+class ExceptionHandler extends Handler {
 
     /**
      *
      * @param Exception $e
+     *
      * @return type
      */
     public function report(Exception $e)
@@ -21,8 +20,8 @@ public function report(Exception $e)
         $reportableEnvironments = config('laravel-exception-mailer.config.notify_environment');
         if (is_array($reportableEnvironments) && in_array(app()->environment(), $reportableEnvironments))
         {
-            $nonReportableExceptions  = config('laravel-exception-mailer.config.prevent_exception');
-            $shouldReport = true;
+            $nonReportableExceptions = config('laravel-exception-mailer.config.prevent_exception');
+            $shouldReport            = true;
 
             foreach ($nonReportableExceptions as $class)
             {
@@ -43,7 +42,7 @@ public function report(Exception $e)
 
             if ($shouldReport)
             {
-                $eMailer = App::make('ExceptionMailer');
+                $eMailer = app()->make('ExceptionMailer');
                 $eMailer->notifyException($e);
             }
         }

diff --git a/src/LithiumDev/ExceptionMailer/ExceptionMailer.php b/src/LithiumDev/ExceptionMailer/ExceptionMailer.php
@@ -1,10 +1,6 @@
 <?php
-
 namespace LithiumDev\ExceptionMailer;
 
-
-use Illuminate\Support\Facades\Request;
-
 /**
  * Description of ExceptionMailer
  *
@@ -30,17 +26,17 @@ public function notifyException($exception)
         if (! empty($this->env))
         {
             $request                   = array();
-            $request['fullUrl']        = (! \App::runningInConsole()) ? Request::fullUrl() : null;
-            $request['input_get']      = (! \App::runningInConsole()) ? $_GET : [];
-            $request['input_post']     = (! \App::runningInConsole()) ? $_POST : [];
-            $request['input_old']      = (! \App::runningInConsole()) ? Request::old() : [];
-            $request['session']        = (! \App::runningInConsole()) ? \Session::all() : [];
-            $request['cookie']         = (! \App::runningInConsole()) ? Request::cookie() : [];
-            $request['file']           = (! \App::runningInConsole()) ? Request::file() : [];
-            $request['header']         = (! \App::runningInConsole()) ? Request::header() : [];
-            $request['server']         = (! \App::runningInConsole()) ? Request::server() : [];
-            $request['json']           = (! \App::runningInConsole()) ? Request::json() : [];
-            $request['request_format'] = (! \App::runningInConsole()) ? Request::format() : null;
+            $request['fullUrl']        = (! app()->runningInConsole()) ? \Request::fullUrl() : null;
+            $request['input_get']      = (! app()->runningInConsole()) ? $_GET : [];
+            $request['input_post']     = (! app()->runningInConsole()) ? $_POST : [];
+            $request['input_old']      = [];
+            $request['session']        = [];
+            $request['cookie']         = (! app()->runningInConsole()) ? \Request::cookie() : [];
+            $request['file']           = (! app()->runningInConsole()) ? \Request::file() : [];
+            $request['header']         = (! app()->runningInConsole()) ? \Request::header() : [];
+            $request['server']         = (! app()->runningInConsole()) ? \Request::server() : [];
+            $request['json']           = (! app()->runningInConsole()) ? \Request::json() : [];
+            $request['request_format'] = (! app()->runningInConsole()) ? \Request::format() : null;
             $request['error']          = $exception->getTraceAsString();
             $request['subject_line']   = $exception->getMessage();
             $request['class_name']     = get_class($exception);
@@ -53,7 +49,7 @@ public function notifyException($exception)
                         $message->to($recipient['address'], $recipient['name']);
                     }
 
-                    $subject = (! \App::runningInConsole()) ? "URL: " . $request['fullUrl'] : " CLI Command Failure";
+                    $subject = (! app()->runningInConsole()) ? "URL: " . $request['fullUrl'] : " CLI Command Failure";
                     $message->subject("{$this->config['subject']} - " . $subject);
                 });
             }

diff --git a/src/LithiumDev/ExceptionMailer/ExceptionMailerServiceProvider.php b/src/LithiumDev/ExceptionMailer/ExceptionMailerServiceProvider.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace LithiumDev\ExceptionMailer;
 
 
@@ -22,8 +21,8 @@ public function boot()
     {
         $this->publishes([
             __DIR__ . '/../../config/config.php' => config_path('laravel-exception-mailer/config.php'),
-            __DIR__ . '/../../views' => base_path('resources/views/vendor/laravel-exception-mailer'),
-            ]);
+            __DIR__ . '/../../views'             => base_path('resources/views/vendor/laravel-exception-mailer'),
+        ]);
         $this->loadViewsFrom(__DIR__ . '/../../views', 'laravel-exception-mailer');
 
         $this->app->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'LithiumDev\ExceptionMailer\ExceptionHandler');

diff --git a/src/LithiumDev/ExceptionMailer/Facades/ExceptionMailerFacade.php b/src/LithiumDev/ExceptionMailer/Facades/ExceptionMailerFacade.php
@@ -1,7 +1,7 @@
 <?php
-
 namespace LithiumDev\ExceptionMailer\Facades;
 
+
 use Illuminate\Support\Facades\Facade;
 
 class ExceptionMailerFacade extends Facade {
@@ -11,7 +11,8 @@ class ExceptionMailerFacade extends Facade {
      *
      * @return string
      */
-    protected static function getFacadeAccessor() {
+    protected static function getFacadeAccessor()
+    {
         return 'ExceptionMailer';
     }