refactor(DebugBarOutput): Improve class handling for Laravel Debugbar

- Replace direct class references with a method to determine the class.
- Simplify the output method's return type to object.
- Comment out unnecessary assertions for better flexibility.
- Update test case to use the new method for class resolution.

Author: guanguans

composer-dependency-analyser.php

@@ -41,11 +41,11 @@
         ],
         [ErrorType::SHADOW_DEPENDENCY]
     )
-    ->ignoreErrorsOnPackageAndPath(
-        'barryvdh/laravel-debugbar',
-        __DIR__.'/src/Outputs/DebugBarOutput.php',
-        [ErrorType::DEV_DEPENDENCY_IN_PROD]
-    )
+    // ->ignoreErrorsOnPackageAndPath(
+    //     'barryvdh/laravel-debugbar',
+    //     __DIR__.'/src/Outputs/DebugBarOutput.php',
+    //     [ErrorType::DEV_DEPENDENCY_IN_PROD]
+    // )
     ->ignoreErrorsOnPackageAndPath(
         'php-debugbar/php-debugbar',
         __DIR__.'/src/Outputs/DebugBarOutput.php',

src/Outputs/DebugBarOutput.php

@@ -13,7 +13,6 @@
 
 namespace Guanguans\LaravelSoar\Outputs;
 
-use Barryvdh\Debugbar\LaravelDebugbar;
 use DebugBar\DataCollector\MessagesCollector;
 use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Support\Collection;
@@ -31,23 +30,22 @@ public function __construct(
      */
     public function shouldOutput(CommandFinished|Response $outputter): bool
     {
-        return class_exists(LaravelDebugbar::class)
-            && app()->has(LaravelDebugbar::class)
-            // && resolve(LaravelDebugbar::class)->isEnabled()
+        return class_exists(self::laravelDebugbarClass())
+            && app()->has(self::laravelDebugbarClass())
+            // && resolve($this->laravelDebugbarClass())->isEnabled()
             && $this->isHtmlResponse($outputter);
     }
 
     /**
      * @throws \DebugBar\DebugBarException
      * @throws \JsonException
      *
-     * @noinspection PhpPossiblePolymorphicInvocationInspection
+     * @return \Barryvdh\Debugbar\LaravelDebugbar|\Fruitcake\LaravelDebugbar\LaravelDebugbar
      */
-    public function output(Collection $scores, CommandFinished|Response $outputter): LaravelDebugbar
+    public function output(Collection $scores, CommandFinished|Response $outputter): object
     {
-        $debugBar = resolve(LaravelDebugbar::class);
-
-        \assert($debugBar instanceof LaravelDebugbar);
+        $debugBar = resolve(self::laravelDebugbarClass());
+        // \assert($debugBar instanceof LaravelDebugbar);
 
         if (!$debugBar->hasCollector($this->name)) {
             $debugBar->addCollector(new MessagesCollector($this->name));
@@ -61,4 +59,26 @@ public function output(Collection $scores, CommandFinished|Response $outputter):
 
         return $debugBar;
     }
+
+    /**
+     * @api
+     *
+     * @return class-string<\Barryvdh\Debugbar\ServiceProvider|\Fruitcake\LaravelDebugbar\ServiceProvider>
+     */
+    public static function laravelDebugbarServiceProviderClass(): string
+    {
+        return class_exists($class = 'Fruitcake\LaravelDebugbar\ServiceProvider')
+            ? $class
+            : 'Barryvdh\Debugbar\ServiceProvider';
+    }
+
+    /**
+     * @return class-string<\Barryvdh\Debugbar\LaravelDebugbar|\Fruitcake\LaravelDebugbar\LaravelDebugbar>
+     */
+    private static function laravelDebugbarClass(): string
+    {
+        return class_exists($class = 'Fruitcake\LaravelDebugbar\LaravelDebugbar')
+            ? $class
+            : 'Barryvdh\Debugbar\LaravelDebugbar';
+    }
 }

testbench.yaml

@@ -2,7 +2,8 @@ laravel: '@testbench'
 
 providers:
   - Workbench\App\Providers\WorkbenchServiceProvider
-  - Barryvdh\Debugbar\ServiceProvider
+  # - Barryvdh\Debugbar\ServiceProvider
+  # - Fruitcake\LaravelDebugbar\ServiceProvider
   - Clockwork\Support\Laravel\ClockworkServiceProvider
   - Guanguans\LaravelSoar\SoarServiceProvider
   - LaraDumps\LaraDumps\LaraDumpsServiceProvider

tests/TestCase.php

@@ -25,6 +25,7 @@
 namespace Guanguans\LaravelSoarTests;
 
 use Guanguans\LaravelSoar\Facades\Soar;
+use Guanguans\LaravelSoar\Outputs\DebugBarOutput;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithViews;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
@@ -68,6 +69,14 @@ protected function getPackageAliases(mixed $app): array
         ];
     }
 
+    protected function getPackageProviders(mixed $app): array
+    {
+        return [
+            ...parent::getPackageProviders($app),
+            DebugBarOutput::laravelDebugbarServiceProviderClass(),
+        ];
+    }
+
     protected function defineEnvironment(mixed $app): void
     {
         tap($app->make(Repository::class), function (Repository $repository): void {