Fix phpstan errors and SolutionProviderRepository types

src/Config/FileConfigManager.php

@@ -73,7 +73,8 @@ public function load(): array
         return $this->readFromFile();
     }
 
-    protected function readFromFile()
+    /** @return array<string, mixed> */
+    protected function readFromFile(): array
     {
         if (! $this->isValidFile()) {
             return [];
@@ -120,6 +121,11 @@ protected function createFile(): bool
         return (file_put_contents($this->file, '') !== false);
     }
 
+    /**
+     * @param array<string, mixed> $options
+     *
+     * @return bool
+     */
     protected function saveToFile(array $options): bool
     {
         try {

src/Config/IgnitionConfig.php

@@ -6,6 +6,7 @@
 use Spatie\Ignition\Contracts\ConfigManager;
 use Throwable;
 
+/** @implements Arrayable<string, string|null|bool|array<string, mixed>> */
 class IgnitionConfig implements Arrayable
 {
     private ConfigManager $manager;
@@ -36,6 +37,7 @@ public function setOption(string $name, string $value): self
     private function initConfigManager(): ConfigManager
     {
         try {
+            /** @phpstan-ignore-next-line  */
             return app(ConfigManager::class);
         } catch (Throwable) {
             return new FileConfigManager();
@@ -121,7 +123,7 @@ public function runnableSolutionsEnabled(): bool
         return (bool)($this->options['enable_runnable_solutions'] ?? false);
     }
 
-    /** @return array<string, mixed> */
+    /** @return array<string, string|null|bool|array<string, mixed>> */
     public function toArray(): array
     {
         return [

src/Contracts/HasSolutionsForThrowable.php

@@ -4,6 +4,9 @@
 
 use Throwable;
 
+/**
+ * Interface used for SolutionProviders.
+ */
 interface HasSolutionsForThrowable
 {
     public function canSolve(Throwable $throwable): bool;

src/Contracts/ProvidesSolution.php

@@ -2,6 +2,9 @@
 
 namespace Spatie\Ignition\Contracts;
 
+/**
+ * Interface to be used on exceptions that provide their own solution.
+ */
 interface ProvidesSolution
 {
     public function getSolution(): Solution;

src/Contracts/SolutionProviderRepository.php

@@ -7,18 +7,18 @@
 interface SolutionProviderRepository
 {
     /**
-     * @param class-string<ProvidesSolution>|ProvidesSolution $solutionProviderClass
+     * @param class-string<HasSolutionsForThrowable>|HasSolutionsForThrowable $solutionProvider
      *
      * @return $this
      */
-    public function registerSolutionProvider(string|ProvidesSolution $solutionProviderClass): self;
+    public function registerSolutionProvider(string|HasSolutionsForThrowable $solutionProvider): self;
 
     /**
-     * @param array<class-string<ProvidesSolution>|ProvidesSolution> $solutionProviderClasses
+     * @param array<class-string<HasSolutionsForThrowable>|HasSolutionsForThrowable> $solutionProviders
      *
      * @return $this
      */
-    public function registerSolutionProviders(array $solutionProviderClasses): self;
+    public function registerSolutionProviders(array $solutionProviders): self;
 
     /**
      * @param Throwable $throwable

src/Ignition.php

@@ -14,7 +14,6 @@
 use Spatie\FlareClient\Report;
 use Spatie\Ignition\Config\IgnitionConfig;
 use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
-use Spatie\Ignition\Contracts\ProvidesSolution;
 use Spatie\Ignition\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
 use Spatie\Ignition\ErrorPage\ErrorPageViewModel;
 use Spatie\Ignition\ErrorPage\Renderer;
@@ -151,7 +150,7 @@ public function glow(
     }
 
     /**
-     * @param array<int, ProvidesSolution|class-string<ProvidesSolution>> $solutionProviders
+     * @param array<int, HasSolutionsForThrowable|class-string<HasSolutionsForThrowable>> $solutionProviders
      *
      * @return $this
      */

src/Solutions/SolutionProviders/SolutionProviderRepository.php

@@ -20,9 +20,9 @@ public function __construct(array $solutionProviders = [])
         $this->solutionProviders = Collection::make($solutionProviders);
     }
 
-    public function registerSolutionProvider(string|ProvidesSolution $solutionProviderClass): SolutionProviderRepositoryContract
+    public function registerSolutionProvider(string|HasSolutionsForThrowable $solutionProvider): SolutionProviderRepositoryContract
     {
-        $this->solutionProviders->push($solutionProviderClass);
+        $this->solutionProviders->push($solutionProvider);
 
         return $this;
     }
@@ -85,11 +85,12 @@ public function getSolutionForClass(string $solutionClass): ?Solution
         return app($solutionClass);
     }
 
+    /** @return Collection<int, HasSolutionsForThrowable> */
     protected function initialiseSolutionProviderRepositories(): Collection
     {
         return $this->solutionProviders
             ->filter(fn (HasSolutionsForThrowable|string $provider) => in_array(HasSolutionsForThrowable::class, class_implements($provider) ?: []))
-            ->map(function (string|HasSolutionsForThrowable $provider) {
+            ->map(function (string|HasSolutionsForThrowable $provider): HasSolutionsForThrowable {
                 if (is_string($provider)) {
                     return new $provider;
                 }

src/Solutions/SolutionProviders/UndefinedPropertySolutionProvider.php

@@ -110,7 +110,7 @@ protected function findPossibleProperty(string $class, string $invalidPropertyNa
     /**
      * @param class-string $class
      *
-     * @return Collection<string, string>
+     * @return Collection<int, ReflectionProperty>
      */
     protected function getAvailableProperties(string $class): Collection
     {

src/Solutions/SolutionTransformer.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Spatie\Ignition\Contracts\Solution;
 
+/** @implements Arrayable<string, array<string,string>|string|false> */
 class SolutionTransformer implements Arrayable
 {
     protected Solution $solution;