laravel7 updates

Author: jeremykenedy

.styleci.yml

@@ -0,0 +1,8 @@
+preset: laravel
+
+enabled:
+  - strict
+  - align_double_arrow
+
+disabled:
+  - unused_use

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 <Jeremy Kenedy>
+Copyright (c) 2017-2020 <Jeremy Kenedy>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

readme.md

@@ -1,4 +1,4 @@
-# Laravel Exception Notifier | A Laravel Exceptions Email Notification [Package](https://packagist.org/packages/jeremykenedy/laravel-exception-notifier)
+# Laravel Exception Notifier | A Laravel 5, 6, and 7 Exceptions Email Notification [Package](https://packagist.org/packages/jeremykenedy/laravel-exception-notifier)
 
 [![Total Downloads](https://poser.pugx.org/jeremykenedy/laravel-exception-notifier/d/total.svg)](https://packagist.org/packages/jeremykenedy/laravel-exception-notifier)
 [![Latest Stable Version](https://poser.pugx.org/jeremykenedy/laravel-exception-notifier/v/stable.svg)](https://packagist.org/packages/jeremykenedy/laravel-exception-notifier)
@@ -21,15 +21,23 @@ Laravel exception notifier will send an email of the error along with the stack
 Get the errors and fix them before the client even reports them, that's why this exists!
 
 ## Requirements
-* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8+](https://laravel.com/docs/installation)
+* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6, & 7+](https://laravel.com/docs/installation)
 
 ## Installation Instructions
 1. From your projects root folder in terminal run:
 
+    Laravel 7+ use:
+
     ```
         composer require jeremykenedy/laravel-exception-notifier
     ```
 
+    Laravel 6 and below use:
+
+    ```
+        composer require jeremykenedy/laravel-exception-notifier:1.2.0
+    ```
+
 2. Register the package
 * Laravel 5.5 and up
 Uses package auto discovery feature, no need to edit the `config/app.php` file.
@@ -47,69 +55,66 @@ Register the package with laravel in `config/app.php` under `providers` with the
         php artisan vendor:publish --tag=laravelexceptionnotifier
     ```
 
-4. In `App\Exceptions\Handler.php` include the following classes in the head:
+4. In `App\Exceptions\Handler.php` include the additional following classes in the head:
 
 ```
     use App\Mail\ExceptionOccured;
     use Illuminate\Support\Facades\Log;
     use Mail;
-    use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
     use Symfony\Component\Debug\Exception\FlattenException;
+    use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
 ```
 
 5. In `App\Exceptions\Handler.php` replace the `report()` method with:
 
     ```
-        /**
-         * Report or log an exception.
-         *
-         * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-         *
-         * @param  \Exception  $exception
-         * @return void
-         */
-        public function report(Exception $exception)
-        {
-
-            $enableEmailExceptions = config('exceptions.emailExceptionEnabled');
-
-            if ($enableEmailExceptions === "") {
-                $enableEmailExceptions = config('exceptions.emailExceptionEnabledDefault');
-            }
-
-            if ($enableEmailExceptions && $this->shouldReport($exception)) {
-                $this->sendEmail($exception);
-            }
-
-            parent::report($exception);
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param \Throwable $exception
+     *
+     * @return void
+     */
+    public function report(Throwable $exception)
+    {
+        $enableEmailExceptions = config('exceptions.emailExceptionEnabled');
+
+        if ($enableEmailExceptions === '') {
+            $enableEmailExceptions = config('exceptions.emailExceptionEnabledDefault');
         }
-    ```
 
-6. In `App\Exceptions\Handler.php` add the method `sendEmail()`:
+        if ($enableEmailExceptions && $this->shouldReport($exception)) {
+            $this->sendEmail($exception);
+        }
 
+        parent::report($exception);
+    }
     ```
-        /**
-         * Sends an email upon exception.
-         *
-         * @param  \Exception  $exception
-         * @return void
-         */
-        public function sendEmail(Exception $exception)
-        {
-            try {
-
-                $e = FlattenException::create($exception);
-                $handler = new SymfonyExceptionHandler();
-                $html = $handler->getHtml($e);
-
-                Mail::send(new ExceptionOccured($html));
 
-            } catch (Exception $exception) {
-
-                Log::error($exception);
+6. In `App\Exceptions\Handler.php` add the method `sendEmail()`:
 
-            }
+    ```
+    /**
+     * Sends an email upon exception.
+     *
+     * @param \Throwable $exception
+     *
+     * @return void
+     */
+    public function sendEmail(Throwable $exception)
+    {
+        try {
+            $e = FlattenException::create($exception);
+            $handler = new SymfonyExceptionHandler();
+            $html = $handler->getHtml($e);
+
+            Mail::send(new ExceptionOccured($html));
+        } catch (Throwable $exception) {
+            Log::error($exception);
         }
+    }
     ```
 
 7. Configure your email settings in the `.env` file.

src/App/Traits/ExceptionNotificationHandlerTrait.php

@@ -7,6 +7,7 @@
 use Mail;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
+use Throwable;
 
 trait ExceptionNotificationHandlerTrait
 {
@@ -29,11 +30,11 @@ trait ExceptionNotificationHandlerTrait
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         $enableEmailExceptions = config('exceptions.emailExceptionEnabled');
 
@@ -53,19 +54,19 @@ public function report(Exception $exception)
     /**
      * Sends an email upon exception.
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
      * @return void
      */
-    public function sendEmail(Exception $exception)
+    public function sendEmail(Throwable $exception)
     {
         try {
             $e = FlattenException::create($exception);
             $handler = new SymfonyExceptionHandler();
             $html = $handler->getHtml($e);
 
             Mail::send(new ExceptionOccured($html));
-        } catch (Exception $exception) {
+        } catch (Throwable $exception) {
             Log::error($exception);
         }
     }