From fdf6a8c9572cb1fcae0e974bf5811499d1d3b6bf Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 11 Oct 2024 16:08:50 +0100
Subject: [PATCH] [7.x] Clean up `ServiceProvider` (#622)

---
 composer.json                                 |  2 +-
 src/Fieldtypes/BaseFieldtype.php              |  4 +-
 .../Scopes/Filters => Scopes}/Fields.php      |  2 +-
 .../Filters => Scopes}/Fields/Models.php      |  2 +-
 .../Scopes/Filters => Scopes}/Status.php      |  2 +-
 src/ServiceProvider.php                       | 41 -------------------
 tests/Query/Scopes/Filters/ModelsTest.php     |  2 +-
 7 files changed, 7 insertions(+), 48 deletions(-)
 rename src/{Query/Scopes/Filters => Scopes}/Fields.php (96%)
 rename src/{Query/Scopes/Filters => Scopes}/Fields/Models.php (98%)
 rename src/{Query/Scopes/Filters => Scopes}/Status.php (93%)

diff --git a/composer.json b/composer.json
index 1374feb6..b681deaf 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
         "pixelfear/composer-dist-plugin": "^0.1.5",
         "spatie/ignition": "^1.15",
         "spatie/invade": "^2.1",
-        "statamic/cms": "^5.26.0"
+        "statamic/cms": "^5.30.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
diff --git a/src/Fieldtypes/BaseFieldtype.php b/src/Fieldtypes/BaseFieldtype.php
index 20f5105f..5c4f1a24 100644
--- a/src/Fieldtypes/BaseFieldtype.php
+++ b/src/Fieldtypes/BaseFieldtype.php
@@ -16,11 +16,11 @@
 use Statamic\Search\Result;
 use StatamicRadPack\Runway\Http\Resources\CP\FieldtypeModel;
 use StatamicRadPack\Runway\Http\Resources\CP\FieldtypeModels;
-use StatamicRadPack\Runway\Query\Scopes\Filters\Fields\Models;
 use StatamicRadPack\Runway\Resource;
 use StatamicRadPack\Runway\Runway;
+use StatamicRadPack\Runway\Scopes\Fields\Models;
 
-class BaseFieldtype extends Relationship
+abstract class BaseFieldtype extends Relationship
 {
     protected $canEdit = true;
     protected $canCreate = true;
diff --git a/src/Query/Scopes/Filters/Fields.php b/src/Scopes/Fields.php
similarity index 96%
rename from src/Query/Scopes/Filters/Fields.php
rename to src/Scopes/Fields.php
index c84b80a5..d506e0ec 100644
--- a/src/Query/Scopes/Filters/Fields.php
+++ b/src/Scopes/Fields.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace StatamicRadPack\Runway\Query\Scopes\Filters;
+namespace StatamicRadPack\Runway\Scopes;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
diff --git a/src/Query/Scopes/Filters/Fields/Models.php b/src/Scopes/Fields/Models.php
similarity index 98%
rename from src/Query/Scopes/Filters/Fields/Models.php
rename to src/Scopes/Fields/Models.php
index 47f7b101..6ddf82de 100644
--- a/src/Query/Scopes/Filters/Fields/Models.php
+++ b/src/Scopes/Fields/Models.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace StatamicRadPack\Runway\Query\Scopes\Filters\Fields;
+namespace StatamicRadPack\Runway\Scopes\Fields;
 
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use Statamic\Query\Scopes\Filters\Fields\FieldtypeFilter;
diff --git a/src/Query/Scopes/Filters/Status.php b/src/Scopes/Status.php
similarity index 93%
rename from src/Query/Scopes/Filters/Status.php
rename to src/Scopes/Status.php
index b883620d..916646e0 100644
--- a/src/Query/Scopes/Filters/Status.php
+++ b/src/Scopes/Status.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace StatamicRadPack\Runway\Query\Scopes\Filters;
+namespace StatamicRadPack\Runway\Scopes;
 
 use Illuminate\Support\Collection;
 use Statamic\Query\Scopes\Filters\Status as BaseStatusFilter;
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 1c90ae7e..70b6e6b3 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -9,7 +9,6 @@
 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;
@@ -28,46 +27,6 @@
 
 class ServiceProvider extends AddonServiceProvider
 {
-    use Conditionable;
-
-    protected $actions = [
-        Actions\DeleteModel::class,
-        Actions\DuplicateModel::class,
-        Actions\Publish::class,
-        Actions\Unpublish::class,
-    ];
-
-    protected $commands = [
-        Console\Commands\GenerateMigration::class,
-        Console\Commands\ListResources::class,
-        Console\Commands\MigrateBlueprints::class,
-        Console\Commands\RebuildUriCache::class,
-    ];
-
-    protected $fieldtypes = [
-        Fieldtypes\BelongsToFieldtype::class,
-        Fieldtypes\HasManyFieldtype::class,
-    ];
-
-    protected $routes = [
-        'cp' => __DIR__.'/../routes/cp.php',
-    ];
-
-    protected $scopes = [
-        Query\Scopes\Filters\Fields::class,
-        Query\Scopes\Filters\Status::class,
-    ];
-
-    protected $tags = [
-        Tags\RunwayTag::class,
-    ];
-
-    protected $updateScripts = [
-        UpdateScripts\ChangePermissionNames::class,
-        UpdateScripts\MigrateBlueprints::class,
-        UpdateScripts\AddManagePublishStatesPermission::class,
-    ];
-
     protected $vite = [
         'publicDirectory' => 'dist',
         'hotFile' => 'vendor/runway/hot',
diff --git a/tests/Query/Scopes/Filters/ModelsTest.php b/tests/Query/Scopes/Filters/ModelsTest.php
index 13c4c85e..9ecc06d9 100644
--- a/tests/Query/Scopes/Filters/ModelsTest.php
+++ b/tests/Query/Scopes/Filters/ModelsTest.php
@@ -5,7 +5,7 @@
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Fields\Field;
 use StatamicRadPack\Runway\Fieldtypes\BelongsToFieldtype;
-use StatamicRadPack\Runway\Query\Scopes\Filters\Fields\Models;
+use StatamicRadPack\Runway\Scopes\Fields\Models;
 use StatamicRadPack\Runway\Tests\Fixtures\Models\Author;
 use StatamicRadPack\Runway\Tests\Fixtures\Models\Post;
 use StatamicRadPack\Runway\Tests\TestCase;