[5.x] Fix blueprint error when publishing Eloquent Driver migrations (#…

…320)

* Fix blueprint error when publishing Eloquent Driver migrations

* Fix styling

* Re-work the fix

---------

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

src/Routing/RoutingModel.php

@@ -10,7 +10,7 @@
 use Statamic\Data\ContainsSupplementalData;
 use Statamic\Data\HasAugmentedData;
 
-class RoutingModel implements Responsable, Augmentable
+class RoutingModel implements Augmentable, Responsable
 {
     use ContainsSupplementalData, HasAugmentedData;
 

src/Runway.php

@@ -26,13 +26,22 @@ public static function discoverResources(): self
                 if (! in_array(Traits\HasRunwayResource::class, class_uses_recursive($model))) {
                     throw new \Exception(__('The HasRunwayResource trait is missing from the [:model] model.', ['model' => $model]));
                 }
-
                 if (! isset($config['blueprint'])) {
                     throw new \Exception(__('The [:model] model is missing a blueprint.', ['model' => $model]));
                 }
 
                 if (is_string($config['blueprint'])) {
-                    $blueprint = Blueprint::find($config['blueprint']);
+                    try {
+                        $blueprint = Blueprint::find($config['blueprint']);
+                    } catch (\Exception $e) {
+                        // If we're running in a console & the blueprint doesn't exist, let's ignore the resource.
+                        // https://github.com/duncanmcclean/runway/pull/320
+                        if (app()->runningInConsole()) {
+                            return;
+                        }
+
+                        throw $e;
+                    }
                 }
 
                 if (is_array($config['blueprint'])) {
@@ -74,7 +83,7 @@ public static function findResource(string $resourceHandle): ?Resource
 
     public static function findResourceByModel(object $model): ?Resource
     {
-        $resource = collect(static::$resources)->filter(fn (Resource $resource) => $resource->model()::class === $model::class)->first();
+        $resource = collect(static::$resources)->filter(fn (Resource $resource) => $model::class === $resource->model()::class)->first();
 
         if (! $resource) {
             throw new ResourceNotFound($model::class);

src/Search/Searchable.php

@@ -14,9 +14,9 @@
 use Statamic\Facades\Site;
 use Statamic\Search\Result as ResultInstance;
 
-class Searchable implements Contract, ContainsQueryableValues, Augmentable
+class Searchable implements Augmentable, ContainsQueryableValues, Contract
 {
-    use HasAugmentedInstance, ContainsSupplementalData;
+    use ContainsSupplementalData, HasAugmentedInstance;
 
     protected $model;
 

src/Traits/HasRunwayResource.php

@@ -12,7 +12,7 @@
 
 trait HasRunwayResource
 {
-    use HasAugmentedInstance, FluentlyGetsAndSets;
+    use FluentlyGetsAndSets, HasAugmentedInstance;
     use ResolvesValues {
         resolveGqlValue as traitResolveGqlValue;
     }

tests/TestCase.php

@@ -246,7 +246,7 @@ public function authorFactory(int $count = 1, array $attributes = [])
 
 class Post extends Model
 {
-    use RunwayRoutes, HasRunwayResource;
+    use HasRunwayResource, RunwayRoutes;
 
     protected $fillable = [
         'title', 'slug', 'body', 'values', 'author_id', 'sort_order',