wip

Author: brendt

packages/core/src/DiscoveryConfig.php

@@ -4,7 +4,34 @@
 
 final class DiscoveryConfig
 {
-    public function __construct(
-        public array $skipDiscovery = [],
-    ) {}
+    private array $skipDiscovery = [];
+
+    public function shouldSkip(string $input): bool
+    {
+        return $this->skipDiscovery[$input] ?? false;
+    }
+
+    public function skipClasses(string ...$classNames): self
+    {
+        foreach ($classNames as $className) {
+            $this->skipDiscovery[$className] = true;
+        }
+
+        return $this;
+    }
+
+    public function skipPaths(string ...$paths): self
+    {
+        foreach ($paths as $path) {
+            $realpath = realpath($path);
+
+            if ($realpath === false) {
+                continue;
+            }
+
+            $this->skipDiscovery[$realpath] = true;
+        }
+
+        return $this;
+    }
 }

packages/core/src/Kernel/LoadDiscoveryClasses.php

@@ -117,7 +117,7 @@ private function buildDiscovery(string $discoveryClass): Discovery
 
                 $input = $file->getPathname();
 
-                if ($this->shouldSkipBasedOnConfig($fileName)) {
+                if ($this->shouldSkipBasedOnConfig($input)) {
                     continue;
                 }
 
@@ -177,7 +177,7 @@ private function shouldSkipBasedOnConfig(ClassReflector|string $input): bool
             $input = $input->getName();
         }
 
-        return in_array($input, $this->discoveryConfig->skipDiscovery, strict: true);
+        return $this->discoveryConfig->shouldSkip($input);
     }
 
     /**

packages/core/src/Kernel/LoadDiscoveryLocations.php

@@ -22,10 +22,10 @@ public function __construct(
     public function __invoke(): void
     {
         $this->kernel->discoveryLocations = [
-            ...$this->kernel->discoveryLocations,
             ...$this->discoverCorePackages(),
             ...$this->discoverVendorPackages(),
             ...$this->discoverAppNamespaces(),
+            ...$this->kernel->discoveryLocations,
         ];
     }
 

tests/Fixtures/Config/discovery.config.php

@@ -0,0 +1,8 @@
+<?php
+
+use Tempest\Core\DiscoveryConfig;
+use Tests\Tempest\Fixtures\GlobalHiddenDiscovery;
+
+return new DiscoveryConfig()
+    ->skipClasses(GlobalHiddenDiscovery::class)
+    ->skipPaths(__DIR__ . '/../../Fixtures/GlobalHiddenPathDiscovery.php');

tests/Fixtures/GlobalHiddenDiscovery.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Tempest\Fixtures;
+
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class GlobalHiddenDiscovery implements Discovery
+{
+    public static bool $discovered = false;
+
+    use IsDiscovery;
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+    }
+
+    public function apply(): void
+    {
+        self::$discovered = true;
+    }
+}

tests/Fixtures/GlobalHiddenPathDiscovery.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Tempest\Fixtures;
+
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class GlobalHiddenPathDiscovery implements Discovery
+{
+    public static bool $discovered = false;
+
+    use IsDiscovery;
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+    }
+
+    public function apply(): void
+    {
+        self::$discovered = true;
+    }
+}

tests/Integration/Core/LoadDiscoveryClassesTest.php

@@ -4,13 +4,13 @@
 
 namespace Tests\Tempest\Integration\Core;
 
+use Tests\Tempest\Fixtures\GlobalHiddenPathDiscovery;
 use PHPUnit\Framework\Attributes\Test;
 use Tempest\Database\DatabaseMigration;
-use Tempest\Database\MigrationDiscovery;
 use Tempest\Database\Migrations\RunnableMigrations;
-use Tempest\Discovery\DiscoveryLocation;
 use Tests\Tempest\Fixtures\Discovery\HiddenDatabaseMigration;
 use Tests\Tempest\Fixtures\Discovery\HiddenMigratableDatabaseMigration;
+use Tests\Tempest\Fixtures\GlobalHiddenDiscovery;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
 use function Tempest\get;
@@ -23,37 +23,26 @@ final class LoadDiscoveryClassesTest extends FrameworkIntegrationTestCase
     #[Test]
     public function do_not_discover(): void
     {
-        $this->kernel->discoveryClasses = [
-            MigrationDiscovery::class,
-        ];
-
-        $this->kernel->discoveryLocations = [
-            new DiscoveryLocation(
-                'Tests\Tempest\Fixtures',
-                __DIR__ . '../../Fixtures/Discovery',
-            ),
-        ];
-
         $migrations = get(RunnableMigrations::class);
 
         $this->assertNotContains(HiddenDatabaseMigration::class, $migrations);
     }
 
     #[Test]
-    public function do_not_discover_except(): void
+    public function do_not_discover_global_class(): void
     {
-        $this->kernel->discoveryClasses = [
-            MigrationDiscovery::class,
-            // TODO: update tests to add `PublishDiscovery` when it's merged
-        ];
+        $this->assertFalse(GlobalHiddenDiscovery::$discovered);
+    }
 
-        $this->kernel->discoveryLocations = [
-            new DiscoveryLocation(
-                'Tests\Tempest\Fixtures',
-                __DIR__ . '../../Fixtures/Discovery',
-            ),
-        ];
+    #[Test]
+    public function do_not_discover_global_path(): void
+    {
+        $this->assertFalse(GlobalHiddenPathDiscovery::$discovered);
+    }
 
+    #[Test]
+    public function do_not_discover_except(): void
+    {
         $migrations = get(RunnableMigrations::class);
 
         $foundMigrations = array_filter(