chore: Update composer.json and OutputManager.php

- Update composer.json to include '@rector-dry-run' in the 'scripts' section
- Refactor OutputManager.php to remove unnecessary code and improve readability

composer.json

@@ -159,7 +159,8 @@
             "@lint",
             "@style-lint",
             "@test",
-            "@psalm"
+            "@psalm",
+            "@rector-dry-run"
         ],
         "checks-parallel": "@composer-parallel composer-validate md-lint lint style-lint test psalm",
         "composer-bin-all-update": "@composer bin all update --ansi -v",

src/OutputManager.php

@@ -17,43 +17,35 @@
 use Guanguans\LaravelSoar\Events\OutputtedEvent;
 use Guanguans\LaravelSoar\Events\OutputtingEvent;
 use Guanguans\LaravelSoar\Exceptions\InvalidArgumentException;
-use Guanguans\LaravelSoar\Outputs\Concerns\ShouldOutput;
+use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Fluent;
+use Illuminate\Support\Str;
 
 class OutputManager extends Fluent implements Output
 {
-    use ShouldOutput;
-
     /**
      * @param array<\Guanguans\LaravelSoar\Contracts\Output> $outputs
      *
      * @noinspection MagicMethodsValidityInspection
      * @noinspection MissingParentCallInspection
      * @noinspection PhpMissingParentConstructorInspection
      */
-    public function __construct(array $outputs = [], array $exclusions = [])
+    public function __construct(array $outputs = [])
     {
         foreach ($outputs as $index => $output) {
             $this->offsetSet($index, $output);
         }
-
-        $this->exclusions = $exclusions;
     }
 
-    /**
-     * @noinspection MissingParentCallInspection
-     *
-     * @param mixed $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value): void
+    public function shouldOutput($dispatcher): bool
     {
-        if (! $value instanceof Output) {
-            throw new InvalidArgumentException(sprintf('The value must be instance of %s', Output::class));
+        $exclusions = config('soar.exclusions', []);
+        if ($dispatcher instanceof CommandFinished) {
+            return ! Str::is($exclusions, $dispatcher->command);
         }
 
-        $this->attributes[$offset] = $value;
+        return ! request()->is($exclusions) && ! request()->routeIs($exclusions);
     }
 
     public function output(Collection $scores, $dispatcher): void
@@ -74,4 +66,19 @@ public function output(Collection $scores, $dispatcher): void
             event(new OutputtedEvent($output, $scores, $result));
         }
     }
+
+    /**
+     * @noinspection MissingParentCallInspection
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value): void
+    {
+        if (! $value instanceof Output) {
+            throw new InvalidArgumentException(sprintf('The value must be instance of %s', Output::class));
+        }
+
+        $this->attributes[$offset] = $value;
+    }
 }

src/Outputs/ClockworkOutput.php

@@ -18,7 +18,7 @@ class ClockworkOutput extends Output
 {
     public function shouldOutput($dispatcher): bool
     {
-        return \function_exists('clock') && parent::shouldOutput($dispatcher);
+        return \function_exists('clock');
     }
 
     /**

src/Outputs/ConsoleOutput.php

@@ -25,7 +25,7 @@ public function __construct(string $method = 'warn')
 
     public function shouldOutput($dispatcher): bool
     {
-        return $this->isHtmlResponse($dispatcher) && parent::shouldOutput($dispatcher);
+        return $this->isHtmlResponse($dispatcher);
     }
 
     public function output(Collection $scores, $dispatcher): void

src/Outputs/DebugBarOutput.php

@@ -34,8 +34,7 @@ public function shouldOutput($dispatcher): bool
         // app(LaravelDebugbar::class)->isEnabled()
         return class_exists(LaravelDebugbar::class)
             && app()->has(LaravelDebugbar::class)
-            && $this->isHtmlResponse($dispatcher)
-            && parent::shouldOutput($dispatcher);
+            && $this->isHtmlResponse($dispatcher);
     }
 
     /**

src/Outputs/JsonOutput.php

@@ -26,7 +26,7 @@ public function __construct(string $key = 'soar_scores')
 
     public function shouldOutput($dispatcher): bool
     {
-        return $this->isJsonResponse($dispatcher) && parent::shouldOutput($dispatcher);
+        return $this->isJsonResponse($dispatcher);
     }
 
     public function output(Collection $scores, $dispatcher): void

src/Outputs/NullOutput.php

@@ -12,16 +12,10 @@
 
 namespace Guanguans\LaravelSoar\Outputs;
 
-use Guanguans\LaravelSoar\Contracts\Output;
 use Illuminate\Support\Collection;
 
-class NullOutput implements Output
+class NullOutput extends Output
 {
-    public function shouldOutput($dispatcher): bool
-    {
-        return true;
-    }
-
     public function output(Collection $scores, $dispatcher): void
     {
         // noop

src/Outputs/Output.php

@@ -16,12 +16,15 @@
 use Guanguans\LaravelSoar\Outputs\Concerns\OutputConditions;
 use Guanguans\LaravelSoar\Outputs\Concerns\ScoresHydrator;
 use Guanguans\LaravelSoar\Outputs\Concerns\ScoresSanitizer;
-use Guanguans\LaravelSoar\Outputs\Concerns\ShouldOutput;
 
 abstract class Output implements \Guanguans\LaravelSoar\Contracts\Output, Sanitizer
 {
     use OutputConditions;
     use ScoresHydrator;
     use ScoresSanitizer;
-    use ShouldOutput;
+
+    public function shouldOutput($dispatcher): bool
+    {
+        return true;
+    }
 }

src/Outputs/RayOutput.php

@@ -25,7 +25,7 @@ public function __construct(string $label = 'Soar Scores')
 
     public function shouldOutput($dispatcher): bool
     {
-        return \function_exists('ray') && parent::shouldOutput($dispatcher);
+        return \function_exists('ray');
     }
 
     /**

src/Outputs/SoarBarOutput.php

@@ -29,9 +29,7 @@ public function __construct(string $name = 'Scores', string $label = 'warning')
 
     public function shouldOutput($dispatcher): bool
     {
-        return ! DebugBarOutput::isOutputted()
-            && $this->isHtmlResponse($dispatcher)
-            && parent::shouldOutput($dispatcher);
+        return ! DebugBarOutput::isOutputted() && $this->isHtmlResponse($dispatcher);
     }
 
     /**

src/SoarServiceProvider.php

@@ -145,10 +145,7 @@ protected function registerOutputManager(): void
 
                     return [$class => $container->make($class, $parameters)];
                 })
-                ->pipe(static fn (Collection $collection): OutputManager => new OutputManager(
-                    $collection->all(),
-                    config('soar.exclusions')
-                ))
+                ->pipe(static fn (Collection $collection): OutputManager => new OutputManager($collection->all()))
         );
 
         $this->app->alias(OutputManager::class, $this->toAlias(OutputManager::class));