Merge remote-tracking branch 'origin/main' into sampling-and-entry-point

# Conflicts:
#	src/FlareConfig.php
#	src/FlareMiddleware/AddSolutions.php
#	src/FlareProvider.php

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",

shared/ExpectReport.php

@@ -84,13 +84,6 @@ public function expectLevel(string $level): self
         return $this;
     }
 
-    public function expectSolutionCount(int $count): self
-    {
-        expect($this->report['solutions'])->toHaveCount($count);
-
-        return $this;
-    }
-
     public function expectEventCount(int $count, null|FlareSpanType|FlareSpanEventType $type = null): self
     {
         $events = $this->expectReportEvents;

src/Enums/CollectType.php

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

src/Flare.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Exception;
-use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
 use Spatie\FlareClient\Contracts\Recorders\Recorder;
 use Spatie\FlareClient\Enums\RecorderType;
 use Spatie\FlareClient\Recorders\CacheRecorder\CacheRecorder;
@@ -129,16 +128,6 @@ public function reportHandled(Throwable $throwable): ?ReportFactory
         return $this->reporter->reportHandled($throwable);
     }
 
-    /**
-     * @param class-string<HasSolutionsForThrowable> ...$solutionProviders
-     */
-    public function withSolutionProvider(string ...$solutionProviders): self
-    {
-        $this->reporter->withSolutionProvider(...$solutionProviders);
-
-        return $this;
-    }
-
     /**
      * @param Closure(Exception): bool $filterExceptionsCallable
      */

src/FlareConfig.php

@@ -15,10 +15,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\Contracts\FlareCollectType;
 use Spatie\FlareClient\Contracts\Recorders\Recorder;
 use Spatie\FlareClient\Enums\CollectType;
@@ -62,7 +58,6 @@ class FlareConfig
      * @param null|Closure(ReportFactory): bool $filterReportsCallable
      * @param array<string, array{type: FlareCollectType, ignored: ?bool, options: array}> $collects
      * @param class-string<Sender> $sender
-     * @param class-string<SolutionProviderRepository> $solutionsProviderRepository
      * @param array{max_spans: int, max_attributes_per_span: int, max_span_events_per_span:int, max_attributes_per_span_event:int}|null $traceLimits
      * @param Closure(Scope):void|null $configureScopeCallable
      * @param Closure(Resource):void|null $configureResourceCallable
@@ -114,7 +109,6 @@ public function __construct(
         // Client Infrastructure
         public string $sender = CurlSender::class,
         public array $senderConfig = [],
-        public string $solutionsProviderRepository = SolutionProviderRepository::class,
         public string $sampler = RateSampler::class,
         public array $samplerConfig = [],
         public string $exporter = OpenTelemetryJsonExporter::class,
@@ -183,7 +177,6 @@ public function useDefaults(): static
             ->collectGitInfo()
             ->collectViews()
             ->collectGlows()
-            ->collectSolutions()
             ->collectErrorsWithTraces()
             ->collectStackFrameArguments()
             ->collectServerInfo()
@@ -201,15 +194,6 @@ public function useDefaults(): static
             );
     }
 
-    public static function defaultSolutionProviders(): array
-    {
-        return [
-            BadMethodCallSolutionProvider::class,
-            MergeConflictSolutionProvider::class,
-            UndefinedPropertySolutionProvider::class,
-        ];
-    }
-
     public static function defaultArgumentReducers(): array
     {
         return [
@@ -354,21 +338,6 @@ public function ignoreGlows(): static
         return $this->ignoreCollect(CollectType::Glows);
     }
 
-    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\Contracts\Recorders\Recorder;
 use Spatie\FlareClient\EntryPoint\EntryPointResolver;
 use Spatie\FlareClient\Enums\FlareMode;
@@ -114,15 +113,6 @@ public function register(): void
             default => $collects->argumentReducers,
         });
 
-        $this->container->singleton(SolutionProviderRepositoryContract::class, function () use ($collects) {
-            /** @var SolutionProviderRepositoryContract $repository */
-            $repository = new $this->config->solutionsProviderRepository;
-
-            $repository->registerSolutionProviders($collects->solutionProviders);
-
-            return $repository;
-        });
-
         $this->container->singleton(Resource::class, function () use ($collects) {
             $resource = new Resource(
                 $this->config->applicationName,
@@ -237,7 +227,6 @@ public function register(): void
                 reportErrorLevels: $this->config->reportErrorLevels,
                 filterExceptionsCallable: $this->config->filterExceptionsCallable,
                 filterReportsCallable: $this->config->filterReportsCallable,
-                solutionProviderRepository: $this->container->get(SolutionProviderRepositoryContract::class),
                 reportFactory: $this->container->get(ReportFactory::class),
                 middleware: $middleware,
                 recorders: $recorders,

src/FlareProvider.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;
@@ -31,9 +29,6 @@ class ReportFactory implements WithAttributes
     /** @var array<Span|SpanEvent> */
     public array $events = [];
 
-    /** @var array<Solution> */
-    public array $solutions = [];
-
     public ?bool $handled = null;
 
     public ?string $trackingUuid = null;
@@ -68,7 +63,6 @@ public function new(): self
         $clone->attributes = [];
         $clone->message = null;
         $clone->events = [];
-        $clone->solutions = [];
         $clone->handled = null;
         $clone->trackingUuid = null;
         $clone->level = null;
@@ -129,13 +123,6 @@ public function spanEvent(SpanEvent ...$spanEvent): self
         return $this;
     }
 
-    public function solution(Solution ...$solution): self
-    {
-        array_push($this->solutions, ...$solution);
-
-        return $this;
-    }
-
     public function trackingUuid(string $uuid): self
     {
         $this->trackingUuid = $uuid;
@@ -188,7 +175,6 @@ public function toArray(): array
             'exceptionClass' => $this->throwable::class,
             'seenAtUnixNano' => $this->time->getCurrentTime(),
             'message' => $this->message,
-            'solutions' => $this->mapSolutions(),
             'stacktrace' => $this->stacktraceMapper->map($this->buildStacktrace(), $this->throwable),
             'previous' => $this->buildPrevious(),
             'openFrameIndex' => null,
@@ -255,24 +241,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

@@ -6,8 +6,6 @@
 use Error;
 use ErrorException;
 use Exception;
-use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
-use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Spatie\FlareClient\Contracts\Recorders\SpanEventsRecorder;
 use Spatie\FlareClient\Contracts\Recorders\SpansRecorder;
 use Spatie\FlareClient\Enums\LifecycleStage;
@@ -41,7 +39,6 @@ public function __construct(
         protected readonly ?int $reportErrorLevels,
         protected null|Closure $filterExceptionsCallable,
         protected null|Closure $filterReportsCallable,
-        protected readonly SolutionProviderRepository $solutionProviderRepository,
         protected readonly ReportFactory $reportFactory,
         protected readonly array $middleware,
         protected readonly Recorders $recorders,
@@ -163,16 +160,6 @@ public function reportHandled(Throwable $throwable): ?ReportFactory
         return $this->report($throwable, handled: true);
     }
 
-    /**
-     * @param class-string<HasSolutionsForThrowable> ...$solutionProviders
-     */
-    public function withSolutionProvider(string ...$solutionProviders): self
-    {
-        $this->solutionProviderRepository->registerSolutionProviders($solutionProviders);
-
-        return $this;
-    }
-
     /**
      * @param Closure(Exception): bool $filterExceptionsCallable
      */

src/Reporter.php

@@ -5,7 +5,6 @@
 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;
@@ -17,7 +16,6 @@
 use Spatie\FlareClient\FlareMiddleware\AddJobInformation;
 use Spatie\FlareClient\FlareMiddleware\AddLogs;
 use Spatie\FlareClient\FlareMiddleware\AddRequestInformation;
-use Spatie\FlareClient\FlareMiddleware\AddSolutions;
 use Spatie\FlareClient\FlareMiddleware\FlareMiddleware;
 use Spatie\FlareClient\Recorders\CacheRecorder\CacheRecorder;
 use Spatie\FlareClient\Recorders\CommandRecorder\CommandRecorder;
@@ -45,9 +43,6 @@ class CollectsResolver
     /** @var array<class-string<Recorder>, array<string, mixed>> */
     public array $recorders = [];
 
-    /** @var array<class-string<HasSolutionsForThrowable>> */
-    public array $solutionProviders = [];
-
     /** @var array<callable(Resource, ContainerInterface):Resource> */
     public array $resourceModifiers = [];
 
@@ -97,7 +92,6 @@ public function execute(
                 CollectType::Cache => $this->cache($options),
                 CollectType::Glows => $this->glows($options),
                 CollectType::LogsWithErrors => $this->logsWithErrors($options),
-                CollectType::Solutions => $this->solutions($options),
                 CollectType::Dumps => $this->dumps($options),
                 CollectType::Queries => $this->queries($options),
                 CollectType::Transactions => $this->transactions($options),
@@ -234,12 +228,6 @@ protected function logsWithErrors(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(