improve class discovering

mozex · Jan 11, 2025 · de2a3ad · de2a3ad
1 parent 0b34fbe
commit de2a3ad
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 7 deletions.
diff --git a/src/ExtendsDiscoverCondition.php b/src/ExtendsDiscoverCondition.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Mozex\Modules;
+
+use Spatie\StructureDiscoverer\Data\DiscoveredClass;
+use Spatie\StructureDiscoverer\Data\DiscoveredStructure;
+use Spatie\StructureDiscoverer\DiscoverConditions\DiscoverCondition;
+
+class ExtendsDiscoverCondition extends DiscoverCondition
+{
+    public function __construct(public string $extends) {}
+
+    public function satisfies(DiscoveredStructure $discoveredData): bool
+    {
+        /** @var DiscoveredClass $discoveredData */
+
+        return $discoveredData->extends == $this->extends
+            || is_subclass_of($discoveredData->extends, $this->extends);
+    }
+}
diff --git a/src/Features/SupportBladeComponents/BladeComponentsScout.php b/src/Features/SupportBladeComponents/BladeComponentsScout.php
@@ -5,6 +5,7 @@
 use Illuminate\View\Component;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Spatie\StructureDiscoverer\Discover;
 
 class BladeComponentsScout extends ModuleClassScout
@@ -17,6 +18,6 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(Component::class);
+            ->custom(new ExtendsDiscoverCondition(Component::class));
     }
 }
diff --git a/src/Features/SupportCommands/CommandsScout.php b/src/Features/SupportCommands/CommandsScout.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Spatie\StructureDiscoverer\Discover;
 
 class CommandsScout extends ModuleClassScout
@@ -17,6 +18,6 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(Command::class);
+            ->custom(new ExtendsDiscoverCondition(Command::class));
     }
 }
diff --git a/src/Features/SupportLivewire/LivewireComponentsScout.php b/src/Features/SupportLivewire/LivewireComponentsScout.php
@@ -5,6 +5,7 @@
 use Livewire\Component;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Spatie\StructureDiscoverer\Discover;
 
 class LivewireComponentsScout extends ModuleClassScout
@@ -17,6 +18,6 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(Component::class);
+            ->custom(new ExtendsDiscoverCondition(Component::class));
     }
 }
diff --git a/src/Features/SupportNova/NovaResourcesScout.php b/src/Features/SupportNova/NovaResourcesScout.php
@@ -6,6 +6,7 @@
 use Laravel\Nova\Resource;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Spatie\StructureDiscoverer\Data\DiscoveredClass;
 use Spatie\StructureDiscoverer\Discover;
 
@@ -19,7 +20,7 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(Resource::class) // @phpstan-ignore-line
+            ->custom(new ExtendsDiscoverCondition(Resource::class)) // @phpstan-ignore-line
             ->custom(
                 fn (DiscoveredClass $structure): bool => ! in_array(ActionResource::class, $structure->extendsChain) // @phpstan-ignore-line
             );

diff --git a/src/Features/SupportSchedules/SchedulesScout.php b/src/Features/SupportSchedules/SchedulesScout.php
@@ -5,6 +5,7 @@
 use Mozex\Modules\Contracts\ConsoleKernel;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Mozex\Modules\Facades\Modules;
 use Spatie\StructureDiscoverer\Data\DiscoveredClass;
 use Spatie\StructureDiscoverer\Discover;
@@ -19,7 +20,7 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(ConsoleKernel::class)
+            ->custom(new ExtendsDiscoverCondition(ConsoleKernel::class))
             ->custom(
                 fn (DiscoveredClass $structure): bool => $structure->name === 'Kernel'
                     && str_ends_with(

diff --git a/src/Features/SupportSeeders/SeedersScout.php b/src/Features/SupportSeeders/SeedersScout.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Seeder;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Mozex\Modules\Facades\Modules;
 use Spatie\StructureDiscoverer\Data\DiscoveredClass;
 use Spatie\StructureDiscoverer\Discover;
@@ -19,7 +20,7 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(Seeder::class)
+            ->custom(new ExtendsDiscoverCondition(Seeder::class))
             ->custom(
                 fn (DiscoveredClass $structure): bool => $structure->name === Modules::moduleNameFromNamespace($structure->namespace).'DatabaseSeeder'
             );

diff --git a/src/Features/SupportServiceProviders/ServiceProvidersScout.php b/src/Features/SupportServiceProviders/ServiceProvidersScout.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\ServiceProvider;
 use Mozex\Modules\Contracts\ModuleClassScout;
 use Mozex\Modules\Enums\AssetType;
+use Mozex\Modules\ExtendsDiscoverCondition;
 use Spatie\StructureDiscoverer\Discover;
 
 class ServiceProvidersScout extends ModuleClassScout
@@ -17,6 +18,6 @@ public function asset(): AssetType
     protected function definition(): Discover
     {
         return parent::definition()
-            ->extending(ServiceProvider::class);
+            ->custom(new ExtendsDiscoverCondition(ServiceProvider::class));
     }
 }