Remove error solution support

Drops the spatie/error-solutions integration and the solutions
field from reports. Solutions are no longer surfaced in the Flare
payload and the related collect type, middleware, and config
methods have been removed.

Author: rubenvanassche

composer.json

@@ -15,7 +15,6 @@
         "guzzlehttp/guzzle": "^7.9",
         "psr/container": "^2.0",
         "spatie/backtrace": "^1.8.0",
-        "spatie/error-solutions": "^2.0",
         "symfony/http-foundation": "^5.2|^6.0|^7.0|^8.0",
         "symfony/mime": "^5.2|^6.0|^7.0|^8.0",
         "symfony/process": "^5.2|^6.0|^7.0|^8.0",

src/Disabled/DisabledFlare.php

@@ -196,11 +196,6 @@ public function withApplicationStage(string|Closure $stage): self
         return $this;
     }
 
-    public function withSolutionProvider(string ...$solutionProviders): self
-    {
-        return $this;
-    }
-
     public function filterExceptionsUsing(Closure $filterExceptionsCallable): static
     {
         return $this;

src/Enums/CollectType.php

@@ -14,7 +14,6 @@ enum CollectType: string implements FlareCollectType
     case Cache = 'cache';
     case Glows = 'glows';
     case Logs = 'logs';
-    case Solutions = 'solutions';
     case Throwables = 'throwables';
     case Queries = 'queries';
     case Transactions = 'database_transactions';

src/Flare.php

@@ -7,8 +7,6 @@
 use ErrorException;
 use Exception;
 use Spatie\Backtrace\Arguments\ArgumentReducers;
-use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
-use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Spatie\FlareClient\Contracts\Recorders\Recorder;
 use Spatie\FlareClient\Enums\OverriddenGrouping;
 use Spatie\FlareClient\Enums\RecorderType;
@@ -68,7 +66,6 @@ public function __construct(
         protected readonly ?int $reportErrorLevels,
         protected null|Closure $filterExceptionsCallable,
         protected null|Closure $filterReportsCallable,
-        protected readonly SolutionProviderRepository $solutionProviderRepository,
         protected readonly null|ArgumentReducers $argumentReducers,
         protected readonly bool $collectStackFrameArguments,
         protected Resource $resource,
@@ -490,16 +487,6 @@ public function withApplicationStage(string|Closure $stage): self
         return $this;
     }
 
-    /**
-     * @param class-string<HasSolutionsForThrowable> ...$solutionProviders
-     */
-    public function withSolutionProvider(string ...$solutionProviders): self
-    {
-        $this->solutionProviderRepository->registerSolutionProviders($solutionProviders);
-
-        return $this;
-    }
-
     /**
      * @param Closure(Exception): bool $filterExceptionsCallable
      */

src/FlareConfig.php

@@ -14,10 +14,6 @@
 use Spatie\Backtrace\Arguments\Reducers\EnumArgumentReducer;
 use Spatie\Backtrace\Arguments\Reducers\StdClassArgumentReducer;
 use Spatie\Backtrace\Arguments\Reducers\SymphonyRequestArgumentReducer;
-use Spatie\ErrorSolutions\SolutionProviderRepository;
-use Spatie\ErrorSolutions\SolutionProviders\BadMethodCallSolutionProvider;
-use Spatie\ErrorSolutions\SolutionProviders\MergeConflictSolutionProvider;
-use Spatie\ErrorSolutions\SolutionProviders\UndefinedPropertySolutionProvider;
 use Spatie\FlareClient\AttributesProviders\ConsoleAttributesProvider;
 use Spatie\FlareClient\AttributesProviders\EmptyUserAttributesProvider;
 use Spatie\FlareClient\AttributesProviders\RequestAttributesProvider;
@@ -65,7 +61,6 @@ class FlareConfig
      * @param null|Closure(Report): bool $filterReportsCallable
      * @param array<string, array{type: FlareCollectType, ignored: ?bool, options: array}> $collects
      * @param class-string<Sender> $sender
-     * @param class-string<SolutionProviderRepository> $solutionsProviderRepository
      * @param Closure(Scope):void|null $configureScopeCallable
      * @param Closure(Resource):void|null $configureResourceCallable
      * @param Closure(Span):(void|Span)|null $configureSpansCallable
@@ -92,7 +87,6 @@ public function __construct(
         public ?string $applicationStage = null,
         public string $sender = CurlSender::class,
         public array $senderConfig = [],
-        public string $solutionsProviderRepository = SolutionProviderRepository::class,
         public bool $trace = false,
         public string $sampler = RateSampler::class,
         public array $samplerConfig = [],
@@ -175,7 +169,6 @@ public function useDefaults(): static
             ->collectGitInfo()
             ->collectViews()
             ->collectGlows()
-            ->collectSolutions()
             ->collectErrorsWithTraces()
             ->collectStackFrameArguments()
             ->collectServerInfo()
@@ -193,15 +186,6 @@ public function useDefaults(): static
             );
     }
 
-    public static function defaultSolutionProviders(): array
-    {
-        return [
-            BadMethodCallSolutionProvider::class,
-            MergeConflictSolutionProvider::class,
-            UndefinedPropertySolutionProvider::class,
-        ];
-    }
-
     public static function defaultArgumentReducers(): array
     {
         return [
@@ -317,21 +301,6 @@ public function ignoreLogs(): static
         return $this->ignoreCollect(CollectType::Logs);
     }
 
-    public function collectSolutions(
-        ?array $solutionProviders = null,
-        array $extra = [],
-    ): static {
-        return $this->addCollect(CollectType::Solutions, [
-            'solution_providers' => $solutionProviders ?? static::defaultSolutionProviders(),
-            ...$extra,
-        ]);
-    }
-
-    public function ignoreSolutions(): static
-    {
-        return $this->ignoreCollect(CollectType::Solutions);
-    }
-
     public function collectDumps(
         bool $withTraces = DumpRecorder::DEFAULT_WITH_TRACES,
         bool $withErrors = DumpRecorder::DEFAULT_WITH_ERRORS,

src/FlareMiddleware/AddSolutions.php

@@ -5,7 +5,6 @@
 use Closure;
 use Illuminate\Contracts\Container\Container as IlluminateContainer;
 use Spatie\Backtrace\Arguments\ArgumentReducers;
-use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
 use Spatie\FlareClient\AttributesProviders\ConsoleAttributesProvider;
 use Spatie\FlareClient\AttributesProviders\GitAttributesProvider;
 use Spatie\FlareClient\AttributesProviders\RequestAttributesProvider;
@@ -124,7 +123,6 @@ public function register(): void
         [
             'middlewares' => $middlewares,
             'recorders' => $recorders,
-            'solutionProviders' => $solutionProviders,
             'resourceModifiers' => $resourceModifiers,
             'collectStackFrameArguments' => $collectStackFrameArguments,
             'argumentReducers' => $argumentReducers,
@@ -138,15 +136,6 @@ public function register(): void
             default => $argumentReducers,
         });
 
-        $this->container->singleton(SolutionProviderRepositoryContract::class, function () use ($solutionProviders) {
-            /** @var SolutionProviderRepositoryContract $repository */
-            $repository = new $this->config->solutionsProviderRepository;
-
-            $repository->registerSolutionProviders($solutionProviders);
-
-            return $repository;
-        });
-
         $this->container->singleton(Resource::class, function () use ($resourceModifiers) {
             $resource = new Resource(
                 $this->config->applicationName,
@@ -231,7 +220,6 @@ function ($recorder) {
                 reportErrorLevels: $this->config->reportErrorLevels,
                 filterExceptionsCallable: $this->config->filterExceptionsCallable,
                 filterReportsCallable: $this->config->filterReportsCallable,
-                solutionProviderRepository: $this->container->get(SolutionProviderRepositoryContract::class),
                 argumentReducers: $this->container->get(ArgumentReducers::class),
                 collectStackFrameArguments: $collectStackFrameArguments,
                 resource: $this->container->get(Resource::class),

src/FlareProvider.php

@@ -10,7 +10,6 @@ class Report
 {
     /**
      * @param array<int, array{file: string, lineNumber: int, method: string|null, class: string|null, codeSnippet: array<string>, arguments: array|null, isApplicationFrame: bool}> $stacktrace
-     * @param array<int, array{class: string, title: string, description: string, links: string[], actionDescription: string|null, isRunnable: bool, aiGenerated: bool}> $solutions
      * @param array<int|string, array{type: FlareSpanType|FlareSpanEventType, startTimeUnixNano: int, endTimeUnixNano: int|null, attributes: array}> $events
      */
     public function __construct(
@@ -22,7 +21,6 @@ public function __construct(
         public readonly int $timeUs,
         public readonly ?string $level = null,
         public readonly array $attributes = [],
-        public readonly array $solutions = [],
         public readonly ?string $applicationPath = null,
         public readonly ?int $openFrameIndex = null,
         public readonly ?bool $handled = null,
@@ -42,7 +40,6 @@ public function toArray(): array
             'seenAtUnixNano' => $this->timeUs,
             'message' => $this->message,
             'code' => $this->code,
-            'solutions' => $this->solutions,
             'stacktrace' => $this->stacktrace,
             'openFrameIndex' => $this->openFrameIndex,
             'applicationPath' => $this->applicationPath,

src/Report.php

@@ -7,8 +7,6 @@
 use Spatie\Backtrace\Arguments\ArgumentReducers;
 use Spatie\Backtrace\Backtrace;
 use Spatie\Backtrace\Frame;
-use Spatie\ErrorSolutions\Contracts\RunnableSolution;
-use Spatie\ErrorSolutions\Contracts\Solution;
 use Spatie\FlareClient\Concerns\HasAttributes;
 use Spatie\FlareClient\Contracts\ProvidesFlareContext;
 use Spatie\FlareClient\Contracts\WithAttributes;
@@ -40,9 +38,6 @@ class ReportFactory implements WithAttributes
     /** @var array<Span|SpanEvent> */
     public array $events = [];
 
-    /** @var array<Solution> */
-    public array $solutions = [];
-
     public ?string $notifierName = null;
 
     public ?bool $handled = null;
@@ -145,13 +140,6 @@ public function notifier(string $name): self
         return $this;
     }
 
-    public function addSolutions(Solution ...$solution): self
-    {
-        array_push($this->solutions, ...$solution);
-
-        return $this;
-    }
-
     public function argumentReducers(null|ArgumentReducers $argumentReducers): self
     {
         $this->argumentReducers = $argumentReducers;
@@ -238,7 +226,6 @@ public function build(
             timeUs: $time->getCurrentTime(),
             level: $this->level,
             attributes: $attributes,
-            solutions: $this->mapSolutions(),
             applicationPath: $this->applicationPath,
             openFrameIndex: null,
             handled: $this->handled,
@@ -294,24 +281,4 @@ protected function buildStacktrace(): array
 
         return array_values(array_slice($frames, $firstApplicationFrameIndex));
     }
-
-    protected function mapSolutions(): array
-    {
-        return array_map(
-            function (Solution $solution) {
-                $isRunnable = $solution instanceof RunnableSolution;
-
-                return [
-                    'class' => get_class($solution),
-                    'title' => $solution->getSolutionTitle(),
-                    'description' => $solution->getSolutionDescription(),
-                    'links' => $solution->getDocumentationLinks(),
-                    'actionDescription' => $isRunnable ? $solution->getSolutionActionDescription() : null,
-                    'isRunnable' => $isRunnable,
-                    'aiGenerated' => $solution->aiGenerated ?? false,
-                ];
-            },
-            $this->solutions
-        );
-    }
 }

src/ReportFactory.php

@@ -5,15 +5,13 @@
 use Psr\Container\ContainerInterface;
 use Spatie\Backtrace\Arguments\ArgumentReducers;
 use Spatie\Backtrace\Arguments\Reducers\ArgumentReducer;
-use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
 use Spatie\FlareClient\AttributesProviders\GitAttributesProvider;
 use Spatie\FlareClient\Contracts\FlareCollectType;
 use Spatie\FlareClient\Contracts\Recorders\Recorder;
 use Spatie\FlareClient\Enums\CollectType;
 use Spatie\FlareClient\FlareMiddleware\AddConsoleInformation;
 use Spatie\FlareClient\FlareMiddleware\AddGitInformation;
 use Spatie\FlareClient\FlareMiddleware\AddRequestInformation;
-use Spatie\FlareClient\FlareMiddleware\AddSolutions;
 use Spatie\FlareClient\FlareMiddleware\FlareMiddleware;
 use Spatie\FlareClient\Recorders\ApplicationRecorder\ApplicationRecorder;
 use Spatie\FlareClient\Recorders\CacheRecorder\CacheRecorder;
@@ -40,9 +38,6 @@ class CollectsResolver
     /** @var array<class-string<Recorder>, array<string, mixed>> */
     protected array $recorders = [];
 
-    /** @var array<class-string<HasSolutionsForThrowable>> */
-    protected array $solutionProviders = [];
-
     /** @var array<callable(Resource, ContainerInterface):Resource> */
     protected array $resourceModifiers = [];
 
@@ -55,7 +50,7 @@ class CollectsResolver
 
     protected bool $collectErrorsWithTraces = false;
 
-    /** @return array{middlewares: array<class-string<FlareMiddleware>, array>, recorders: array<class-string<Recorder>, array>, solutionProviders: array<class-string<HasSolutionsForThrowable>>, resourceModifiers: array<callable(Resource, ContainerInterface):Resource>, collectStackFrameArguments: bool, argumentReducers: array<class-string<ArgumentReducer>|ArgumentReducer>|ArgumentReducers, forcePHPStackFrameArgumentsIniSetting: bool, collectErrorsWithTraces:bool} */
+    /** @return array{middlewares: array<class-string<FlareMiddleware>, array>, recorders: array<class-string<Recorder>, array>, resourceModifiers: array<callable(Resource, ContainerInterface):Resource>, collectStackFrameArguments: bool, argumentReducers: array<class-string<ArgumentReducer>|ArgumentReducer>|ArgumentReducers, forcePHPStackFrameArgumentsIniSetting: bool, collectErrorsWithTraces:bool} */
     public function execute(
         array $collects,
     ): array {
@@ -81,7 +76,6 @@ public function execute(
                 CollectType::Cache => $this->cache($options),
                 CollectType::Glows => $this->glows($options),
                 CollectType::Logs => $this->logs($options),
-                CollectType::Solutions => $this->solutions($options),
                 CollectType::Dumps => $this->dumps($options),
                 CollectType::Queries => $this->queries($options),
                 CollectType::Transactions => $this->transactions($options),
@@ -102,7 +96,6 @@ public function execute(
         return [
             'middlewares' => $this->middlewares,
             'recorders' => $this->recorders,
-            'solutionProviders' => $this->solutionProviders,
             'collectStackFrameArguments' => $this->collectStackFrameArguments,
             'argumentReducers' => $this->argumentReducers,
             'forcePHPStackFrameArgumentsIniSetting' => $this->forcePHPStackFrameArgumentsIniSetting,
@@ -190,12 +183,6 @@ protected function logs(array $options): void
         ]));
     }
 
-    protected function solutions(array $solutions): void
-    {
-        $this->addMiddleware($solutions['middleware'] ?? AddSolutions::class);
-        $this->solutionProviders = $solutions['solution_providers'] ?? [];
-    }
-
     protected function dumps(array $options): void
     {
         $this->addRecorder(