refactor: remove generator, pass providers directly

Author: xepozz

.gitignore

@@ -20,3 +20,5 @@ composer.lock
 /phpunit.phar
 /phpunit.xml
 /.phpunit.cache
+.phpunit.result.cache
+

config/params.php

@@ -10,7 +10,7 @@
 return [
     'yiisoft/error-handler' => [
         'solutionProviders' => [
-            Yiisoft\Definitions\Reference::to(Yiisoft\ErrorHandler\Solution\FriendlyExceptionSolution::class),
+            \Yiisoft\Definitions\Reference::to(\Yiisoft\ErrorHandler\Solution\FriendlyExceptionSolution::class),
         ],
     ],
 ];

src/Renderer/HtmlRenderer.php

@@ -12,7 +12,7 @@
 use Yiisoft\ErrorHandler\CompositeException;
 use Yiisoft\ErrorHandler\ErrorData;
 use Yiisoft\ErrorHandler\Exception\ErrorException;
-use Yiisoft\ErrorHandler\Solution\SolutionGenerator;
+use Yiisoft\ErrorHandler\Solution\SolutionProviderInterface;
 use Yiisoft\ErrorHandler\ThrowableRendererInterface;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
 use Yiisoft\Http\Header;
@@ -108,7 +108,10 @@ final class HtmlRenderer implements ThrowableRendererInterface
      */
     private ?array $vendorPaths = null;
 
-    private readonly SolutionGenerator $solutionGenerator;
+    /**
+     * @var SolutionProviderInterface[]
+     */
+    private array $solutionProviders;
 
     /**
      * @param array $settings (deprecated) Settings can have the following keys:
@@ -164,7 +167,7 @@ public function __construct(
             ?? $settings['traceHeaderLine']
             ?? null;
 
-        $this->solutionGenerator = new SolutionGenerator($solutionProviders);
+        $this->solutionProviders = $solutionProviders;
     }
 
     public function render(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
@@ -180,12 +183,11 @@ public function render(Throwable $t, ?ServerRequestInterface $request = null): E
 
     public function renderVerbose(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
     {
-        $solutions = $this->solutionGenerator->generate($t);
         return new ErrorData(
             $this->renderTemplate($this->verboseTemplate, [
                 'request' => $request,
                 'throwable' => $t,
-                'solutions' => $solutions,
+                'solutions' => $this->solutionProviders,
             ]),
             [Header::CONTENT_TYPE => self::CONTENT_TYPE],
         );

src/Solution/SolutionGenerator.php

@@ -4,13 +4,14 @@
 use Yiisoft\ErrorHandler\CompositeException;
 use Yiisoft\ErrorHandler\Exception\ErrorException;
 use Yiisoft\ErrorHandler\Renderer\HtmlRenderer;
+use Yiisoft\ErrorHandler\Solution\SolutionProviderInterface;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
 
 /**
  * @var $this HtmlRenderer
  * @var $request ServerRequestInterface|null
  * @var $throwable Throwable
- * @var $solutions string[]
+ * @var $solutions SolutionProviderInterface[]
  */
 
 $theme = $_COOKIE['yii-exception-theme'] ?? '';
@@ -96,9 +97,11 @@
         if (!empty($solutions)) {
             echo '<div class="solutions">';
             foreach ($solutions as $i => $solution) {
-                echo '<div class="solution solution-' . $i . '">';
-                echo $this->parseMarkdown($solution);
-                echo '</div>';
+                if ($solution->supports($throwable)) {
+                    echo '<div class="solution solution-' . $i . '">';
+                    echo $this->parseMarkdown($solution->generate($throwable));
+                    echo '</div>';
+                }
             }
         }
         ?>