refactor(config): Remove RequestServerCollector and update config

- Removed the RequestServerCollector from the configuration to simplify the collectors used.
- Updated the channels configuration to use environment variables for the log channel and mailer settings.
- Added a flush method to the Channel class to reset skipped callbacks.

Author: guanguans

README.md

@@ -51,8 +51,8 @@ php artisan vendor:publish --provider="Guanguans\\LaravelExceptionNotify\\Except
 ### Configure channels in the `config/exception-notify.php` and `.env` file
 
 ```dotenv
-# EXCEPTION_NOTIFY_DEFAULTS=dingTalk,lark,mail,slack,telegram,...
-EXCEPTION_NOTIFY_DEFAULTS=log,slack,weWork
+# EXCEPTION_NOTIFY_STACK_CHANNELS=dingTalk,lark,mail,slack,telegram,...
+EXCEPTION_NOTIFY_STACK_CHANNELS=log,slack,weWork
 EXCEPTION_NOTIFY_SLACK_WEBHOOK=https://hooks.slack.com/services/TPU9A9/B038KNUC0GY/6pKH3vfa3mjlUPcgLSjzR
 EXCEPTION_NOTIFY_WEWORK_TOKEN=73a3d5a3-ceff-4da8-bcf3-ff5891778
 ```

config/exception-notify.php

@@ -23,7 +23,6 @@
 use Guanguans\LaravelExceptionNotify\Collectors\RequestPostCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestQueryCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestRawFileCollector;
-use Guanguans\LaravelExceptionNotify\Collectors\RequestServerCollector;
 use Guanguans\LaravelExceptionNotify\Contracts\TemplateContract;
 use Guanguans\LaravelExceptionNotify\Jobs\ReportExceptionJob;
 use Guanguans\LaravelExceptionNotify\Mail\ReportExceptionMail;
@@ -90,7 +89,6 @@
         // RequestPostCollector::class,
         // RequestFileCollector::class,
         // RequestRawFileCollector::class,
-        // RequestServerCollector::class,
     ],
 
     /**
@@ -136,15 +134,15 @@
          */
         'log' => [
             'driver' => 'log',
-            'channel' => null,
+            'channel' => env('EXCEPTION_NOTIFY_LOG_CHANNEL'),
         ],
 
         /**
          * @see \Guanguans\LaravelExceptionNotify\Channels\MailChannel
          */
         'mail' => [
             'driver' => 'mail',
-            'mailer' => null,
+            'mailer' => env('EXCEPTION_NOTIFY_MAIL_MAILER'),
             'class' => ReportExceptionMail::class,
             'title' => TemplateContract::TITLE,
             'content' => TemplateContract::CONTENT,

src/Channels/Channel.php

@@ -75,6 +75,11 @@ public static function skipWhen(\Closure $callback): void
         self::$skipCallbacks[] = $callback;
     }
 
+    public static function flush(): void
+    {
+        self::$skipCallbacks = [];
+    }
+
     public function shouldReport(\Throwable $throwable): bool
     {
         return !$this->shouldntReport($throwable);

src/Collectors/RequestServerCollector.php

@@ -41,6 +41,7 @@
  * @method static void reporting(mixed $listener)
  * @method static void reported(mixed $listener)
  * @method static void skipWhen(\Closure $callback)
+ * @method static void flush()
  * @method static bool shouldReport(\Throwable $throwable)
  *
  * @see \Guanguans\LaravelExceptionNotify\ExceptionNotifyManager

src/Facades/ExceptionNotify.php

@@ -104,7 +104,7 @@ function json_pretty_encode(mixed $value, int $options = 0, int $depth = 512): s
     {
         return json_encode(
             $value,
-            \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES | \JSON_THROW_ON_ERROR | $options,
+            \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES | \JSON_THROW_ON_ERROR | \JSON_FORCE_OBJECT | $options,
             $depth
         );
     }

src/Support/helpers.php

@@ -25,11 +25,11 @@
 
 it('can listen reporting and reported event', function (): void {
     ExceptionNotify::reporting(function (ReportingEvent $reportingEvent): void {
-        Log::info($reportingEvent::class);
+        // Log::info($reportingEvent::class);
     });
 
     ExceptionNotify::reported(function (ReportedEvent $reportedEvent): void {
-        Log::info($reportedEvent::class);
+        // Log::info($reportedEvent::class);
     });
 
     expect($this->app->make(ExceptionNotifyManager::class))

tests/Channels/ChannelTest.php

@@ -17,14 +17,16 @@
  * @see https://github.com/guanguans/laravel-exception-notify
  */
 
-use Guanguans\LaravelExceptionNotify\Facades\ExceptionNotify;
+use Guanguans\LaravelExceptionNotify\Channels\Channel;
 use Guanguans\LaravelExceptionNotifyTests\TestCase;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\File;
 
 uses(TestCase::class)
     ->beforeAll(function (): void {})
     ->beforeEach(function (): void {
-        (fn (): array => self::$skipCallbacks = [])->call(ExceptionNotify::driver());
+        Channel::flush();
+        File::delete(glob(storage_path('logs/*.log')));
     })
     ->afterEach(function (): void {})
     ->afterAll(function (): void {})

tests/Pest.php

@@ -27,7 +27,6 @@
 use Guanguans\LaravelExceptionNotify\Collectors\RequestPostCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestQueryCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestRawFileCollector;
-use Guanguans\LaravelExceptionNotify\Collectors\RequestServerCollector;
 use Guanguans\LaravelExceptionNotify\ExceptionNotifyServiceProvider;
 use Guanguans\LaravelExceptionNotify\Exceptions\RuntimeException;
 use Guanguans\LaravelExceptionNotify\Facades\ExceptionNotify;
@@ -92,7 +91,6 @@ protected function defineEnvironment($app): void
             RequestPostCollector::class,
             RequestQueryCollector::class,
             RequestRawFileCollector::class,
-            RequestServerCollector::class,
         ]);
         config()->set('exception-notify.channels.log.pipes', [
             AddKeywordChorePipe::with('keyword'),