Testing

Author: brendt

composer.json

@@ -74,6 +74,7 @@
         "nesbot/carbon": "^3.8",
         "nyholm/psr7": "^1.8",
         "patrickbussmann/oauth2-apple": "^0.3",
+        "php-di/php-di": "^7.0",
         "phpat/phpat": "^0.11.0",
         "phpbench/phpbench": "^1.4",
         "phpstan/phpstan": "2.1.40",
@@ -218,6 +219,7 @@
             "Tempest\\Database\\Tests\\": "packages/database/tests",
             "Tempest\\DateTime\\Tests\\": "packages/datetime/tests",
             "Tempest\\Debug\\Tests\\": "packages/debug/tests",
+            "Tempest\\Discovery\\Tests\\": "packages/discovery/tests",
             "Tempest\\EventBus\\Tests\\": "packages/event-bus/tests",
             "Tempest\\Generation\\Tests\\": "packages/generation/tests",
             "Tempest\\HttpClient\\Tests\\": "packages/http-client/tests",

packages/core/src/Commands/DiscoveryGenerateCommand.php

@@ -45,10 +45,11 @@ public function __invoke(): void
 
             $this->clearDiscoveryCache();
 
-            $this->console->task(
-                label: "Generating discovery cache using the `{$strategy->value}` strategy",
-                handler: fn (Closure $log) => $this->generateDiscoveryCache($strategy, $log),
-            );
+            $this->generateDiscoveryCache($strategy, fn () => null);
+//            $this->console->task(
+//                label: "Generating discovery cache using the `{$strategy->value}` strategy",
+//                handler: fn (Closure $log) => $this->generateDiscoveryCache($strategy, $log),
+//            );
         }
 
         public function clearDiscoveryCache(): void

packages/discovery/composer.json

@@ -10,9 +10,18 @@
         "psr/container": "^2.0",
         "symfony/cache": "^7.3"
     },
+    "require-dev": {
+        "tempest/container": "3.x-dev",
+        "php-di/php-di": "^7.0"
+    },
     "autoload": {
         "psr-4": {
             "Tempest\\Discovery\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tempest\\Discovery\\Tests": "tests"
+        }
     }
 }

packages/discovery/src/BootDiscovery.php

@@ -50,8 +50,8 @@ public function build(
 
         if ($discoveryClasses === null) {
             // DiscoveryDiscovery needs to be applied before we can build all other discoveries
-            $discoveryDiscovery = $this->resolveDiscovery(DiscoveryDiscovery::class);
-            $discoveryDiscovery->setRegistry($this->registry);
+            $discoveryDiscovery = new DiscoveryDiscovery($this->registry);
+            $discoveryDiscovery->setItems(new DiscoveryItems());
 
             // The first pass over all directories to find all discovery classes
             $this->discover([$discoveryDiscovery], $discoveryLocations);

packages/discovery/src/DiscoveryDiscovery.php

@@ -10,14 +10,9 @@ final class DiscoveryDiscovery implements Discovery
 {
     use IsDiscovery;
 
-    private ?Registry $registry = null;
-
-    public function setRegistry(Registry $registry): self
-    {
-        $this->registry = $registry;
-
-        return $this;
-    }
+    public function __construct(
+        private readonly Registry $registry,
+    ) {}
 
     public function discover(DiscoveryLocation $location, ClassReflector $class): void
     {
@@ -34,10 +29,6 @@ public function discover(DiscoveryLocation $location, ClassReflector $class): vo
 
     public function apply(): void
     {
-        if ($this->registry === null) {
-            throw new RegistryWasNotSet();
-        }
-
         foreach ($this->discoveryItems as $className) {
             $this->registry->classes[] = $className;
         }

packages/discovery/src/RegistryWasNotSet.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Tempest\tests;
+
+use DI\Container;
+use PHPUnit\Framework\TestCase;
+use Tempest\Container\GenericContainer;
+use Tempest\Discovery\BootDiscovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\Registry;
+use Tempest\Discovery\Tests\Fixtures\MyDiscoveryClass;
+
+final class DiscoveryTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        MyDiscoveryClass::$discoveredItem = null;
+    }
+
+    public function test_standalone_discovery(): void
+    {
+        $container = new GenericContainer();
+
+        new BootDiscovery(
+            container: $container,
+            registry: new Registry(locations: [
+                new DiscoveryLocation(
+                    namespace: 'Tempest\Discovery\Tests\Fixtures',
+                    path: __DIR__ . '/Fixtures',
+                ),
+            ]),
+        )();
+
+        self::assertNotNull(MyDiscoveryClass::$discoveredItem);
+        $this->assertSame('check', MyDiscoveryClass::$discoveredItem->name);
+    }
+
+    public function test_discovery_with_other_container(): void
+    {
+        $container = new Container();
+
+        new BootDiscovery(
+            container: $container,
+            registry: new Registry(locations: [
+                new DiscoveryLocation(
+                    namespace: 'Tempest\Discovery\Tests\Fixtures',
+                    path: __DIR__ . '/Fixtures',
+                ),
+            ]),
+        )();
+
+        self::assertNotNull(MyDiscoveryClass::$discoveredItem);
+        $this->assertSame('check', MyDiscoveryClass::$discoveredItem->name);
+    }
+}

packages/discovery/tests/DiscoveryTest.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Tempest\Discovery\Tests\Fixtures;
+
+final class DiscoveredItem
+{
+    public function __construct(
+        public string $name,
+    ) {}
+}

packages/discovery/tests/Fixtures/DiscoveredItem.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Tempest\Discovery\Tests\Fixtures;
+
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class MyDiscoveryClass implements Discovery
+{
+    use IsDiscovery;
+
+    public static ?DiscoveredItem $discoveredItem = null;
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+        if ($class->is(DiscoveredItem::class)) {
+            $this->discoveryItems->add($location, $class);
+        }
+    }
+
+    public function apply(): void
+    {
+        /** @var ClassReflector $class */
+        foreach ($this->discoveryItems as $class) {
+            self::$discoveredItem = $class->newInstanceArgs(['name' => 'check']);
+        }
+    }
+}