Optimize

Author: guanguans

src/CollectorManager.php

@@ -16,6 +16,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Fluent;
 use Stringable;
+use Throwable;
 
 class CollectorManager extends Fluent implements Stringable
 {
@@ -40,18 +41,25 @@ public function offsetSet($offset, $value): void
         $this->attributes[$offset] = $value;
     }
 
-    public function __toString()
+    public function toReport(Throwable $e): string
     {
         return (string) collect($this)
-            ->transform(function (Collector $collector) {
-                $collector instanceof ExceptionAware and $collector->setException(app('exception.notify.exception'));
+            ->transform(function (Collector $collector) use ($e) {
+                $collector instanceof ExceptionAware and $collector->setException($e);
 
                 return $collector;
             })
             ->pipe(function (Collection $collectors): string {
-                return $collectors->reduce(function (string $carry, Collector $collector) {
+                $report = $collectors->reduce(function (string $carry, Collector $collector) {
                     return $carry.PHP_EOL.sprintf('%s: %s', $collector->getName(), $collector);
                 }, '');
+
+                return trim($report);
             });
     }
+
+    public function __toString()
+    {
+        return $this->toReport(app('exception.notify.exception'));
+    }
 }

src/ExceptionNotifyManager.php

@@ -30,7 +30,6 @@
 use Guanguans\LaravelExceptionNotify\Jobs\ReportExceptionJob;
 use Guanguans\Notify\Factory;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Manager;
 use Illuminate\Support\Str;
@@ -85,18 +84,6 @@ protected function registerException(Throwable $e)
         $this->container->instance('exception.notify.exception', $e);
     }
 
-    protected function registerReportExceptionJobMethod()
-    {
-        $this->container->bindMethod(
-            sprintf('%s@handle', ReportExceptionJob::class),
-            function (ShouldQueue $job, Container $container) {
-                $report = (string) $container->make(CollectorManager::class);
-
-                return $job->handle($report);
-            }
-        );
-    }
-
     protected function dispatchReportExceptionJob()
     {
         $report = (string) $this->container->make(CollectorManager::class);

src/Jobs/ReportExceptionJob.php

@@ -13,7 +13,6 @@
 use Guanguans\LaravelExceptionNotify\Contracts\Channel;
 use Guanguans\LaravelExceptionNotify\Events\ReportedEvent;
 use Guanguans\LaravelExceptionNotify\Events\ReportingEvent;
-use Guanguans\LaravelExceptionNotify\Pipelines\TrimPipeline;
 use Guanguans\LaravelExceptionNotify\Support\Traits\CreateStatic;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -79,10 +78,7 @@ public function handle()
 
     protected function getChannelPipeline(): array
     {
-        return array_merge(
-            [TrimPipeline::class],
-            config(sprintf('exception-notify.channels.%s.pipeline', $this->channel->getName()), [])
-        );
+        return config(sprintf('exception-notify.channels.%s.pipeline', $this->channel->getName()), []);
     }
 
     protected function pipelineReport(string $report): string