[7.x] Fix Ignition Runnable Solutions (#529)

* Fix Runnable Ignition Solutions

* Fix styling

* Rename solution provider class

---------

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>

Author: duncanmcclean

composer.json

@@ -43,7 +43,7 @@
         "laravel/framework": "^10.25.0 || ^11.0",
         "laravel/prompts": "^0.1.17",
         "pixelfear/composer-dist-plugin": "^0.1.5",
-        "spatie/ignition": "^1.14",
+        "spatie/ignition": "^1.15",
         "statamic/cms": "^5.7.0"
     },
     "require-dev": {

src/Exceptions/TraitMissingException.php

@@ -2,19 +2,10 @@
 
 namespace StatamicRadPack\Runway\Exceptions;
 
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use StatamicRadPack\Runway\Ignition\Solutions\AddTraitToModel;
-
-class TraitMissingException extends \Exception implements ProvidesSolution
+class TraitMissingException extends \Exception
 {
-    public function __construct(protected string $model)
+    public function __construct(public string $model)
     {
         parent::__construct("The HasRunwayResource trait is missing from the [{$model}] model");
     }
-
-    public function getSolution(): Solution
-    {
-        return new AddTraitToModel($this->model);
-    }
 }

src/Ignition/SolutionProviders/TraitMissing.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace StatamicRadPack\Runway\Ignition\SolutionProviders;
+
+use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
+use StatamicRadPack\Runway\Ignition\Solutions\AddTraitToModel;
+use Throwable;
+
+class TraitMissing implements HasSolutionsForThrowable
+{
+    public function canSolve(Throwable $throwable): bool
+    {
+        return $throwable instanceof \StatamicRadPack\Runway\Exceptions\TraitMissingException;
+    }
+
+    public function getSolutions(Throwable $throwable): array
+    {
+        return [new AddTraitToModel($throwable->model)];
+    }
+}

src/Ignition/Solutions/AddTraitToModel.php

@@ -9,9 +9,7 @@
 
 class AddTraitToModel implements RunnableSolution
 {
-    public function __construct(protected $model = null)
-    {
-    }
+    public function __construct(protected $model = null) {}
 
     public function getSolutionTitle(): string
     {

src/Resource.php

@@ -20,8 +20,7 @@ public function __construct(
         protected Model $model,
         protected string $name,
         protected Collection $config
-    ) {
-    }
+    ) {}
 
     public function handle(): string
     {

src/Routing/ResourceResponse.php

@@ -14,9 +14,7 @@ class ResourceResponse implements Responsable
 
     protected $with = [];
 
-    public function __construct(protected $data)
-    {
-    }
+    public function __construct(protected $data) {}
 
     public function toResponse($request)
     {

src/ServiceProvider.php

@@ -2,13 +2,15 @@
 
 namespace StatamicRadPack\Runway;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Conditionable;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Statamic\API\Middleware\Cache;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\CP\Nav;
@@ -19,6 +21,7 @@
 use Statamic\Providers\AddonServiceProvider;
 use Statamic\Statamic;
 use StatamicRadPack\Runway\Http\Controllers\ApiController;
+use StatamicRadPack\Runway\Ignition\SolutionProviders\TraitMissing;
 use StatamicRadPack\Runway\Policies\ResourcePolicy;
 use StatamicRadPack\Runway\Search\Provider as SearchProvider;
 use StatamicRadPack\Runway\Search\Searchable;
@@ -88,6 +91,8 @@ public function boot()
             __DIR__.'/../config/runway.php' => config_path('runway.php'),
         ], 'runway-config');
 
+        $this->registerIgnitionSolutionProviders();
+
         Statamic::booted(function () {
             if ($this->shouldDiscoverResources()) {
                 Runway::discoverResources();
@@ -107,6 +112,16 @@ public function boot()
         });
     }
 
+    protected function registerIgnitionSolutionProviders(): void
+    {
+        try {
+            $this->app->make(SolutionProviderRepository::class)
+                ->registerSolutionProvider(TraitMissing::class);
+        } catch (BindingResolutionException $e) {
+            //
+        }
+    }
+
     protected function registerRouteBindings(): self
     {
         Route::bind('resource', function ($value) {