Merge branch 'main' into fix/invalid-closing-tag-commented-out-code

Author: brendt

.gitignore

@@ -3,6 +3,7 @@
 /package-lock.json
 
 # Top-level+Sub directories
+.tempest/
 .cache/
 .idea/
 build/
@@ -27,4 +28,4 @@ dist
 profile/
 db-main.sqlite
 db-tenant-1.sqlite
-db-tenant-2.sqlite
+db-tenant-2.sqlite

packages/core/src/AppConfig.php

@@ -13,6 +13,8 @@ final class AppConfig
     public string $baseUri;
 
     public function __construct(
+        public ?string $name = null,
+
         ?Environment $environment = null,
 
         ?string $baseUri = null,
@@ -26,7 +28,6 @@ public function __construct(
         public array $insightsProviders = [],
     ) {
         $this->environment = $environment ?? Environment::fromEnv();
-
         $this->baseUri = $baseUri ?? env('BASE_URI') ?? '';
     }
 }

packages/core/src/Config/app.config.php

@@ -4,4 +4,9 @@
 
 use Tempest\Core\AppConfig;
 
-return new AppConfig();
+use function Tempest\env;
+
+return new AppConfig(
+    name: env('APPLICATION_NAME'),
+    baseUri: env('BASE_URI'),
+);

packages/core/src/FrameworkKernel.php

@@ -166,7 +166,7 @@ public function loadConfig(): self
 
     public function registerInternalStorage(): self
     {
-        $path = $this->root . '/vendor/.tempest';
+        $path = $this->root . '/.tempest';
 
         if (! is_dir($path)) {
             mkdir($path, recursive: true);

packages/event-bus/src/EventBus.php

@@ -10,5 +10,5 @@ interface EventBus
 {
     public function dispatch(string|object $event): void;
 
-    public function listen(string|object $event, Closure $handler): void;
+    public function listen(Closure $handler, ?string $event = null): void;
 }

packages/event-bus/src/EventBusConfig.php

@@ -5,7 +5,9 @@
 namespace Tempest\EventBus;
 
 use Closure;
+use InvalidArgumentException;
 use Tempest\Core\Middleware;
+use Tempest\Reflection\FunctionReflector;
 use Tempest\Reflection\MethodReflector;
 
 final class EventBusConfig
@@ -18,8 +20,17 @@ public function __construct(
         public Middleware $middleware = new Middleware(),
     ) {}
 
-    public function addClosureHandler(string $event, Closure $handler): self
+    public function addClosureHandler(Closure $handler, ?string $event = null): self
     {
+        $event ??= new FunctionReflector($handler)
+            ->getParameter(key: 0)
+            ?->getType()
+            ->getName();
+
+        if (! $event) {
+            throw new InvalidArgumentException('The first parameter of the closure must be the event name or type.');
+        }
+
         $handlerKey = spl_object_hash($handler);
 
         $this->handlers[$event][$handlerKey] = new CallableEventHandler(

packages/event-bus/src/GenericEventBus.php

@@ -16,9 +16,9 @@ public function __construct(
         private EventBusConfig $eventBusConfig,
     ) {}
 
-    public function listen(string|object $event, Closure $handler): void
+    public function listen(Closure $handler, ?string $event = null): void
     {
-        $this->eventBusConfig->addClosureHandler($event, $handler);
+        $this->eventBusConfig->addClosureHandler($handler, $event);
     }
 
     public function dispatch(string|object $event): void

packages/event-bus/src/Testing/FakeEventBus.php

@@ -14,9 +14,9 @@ public function __construct(
         public EventBusConfig $eventBusConfig,
     ) {}
 
-    public function listen(string|object $event, Closure $handler): void
+    public function listen(Closure $handler, ?string $event = null): void
     {
-        $this->eventBusConfig->addClosureHandler($event, $handler);
+        $this->eventBusConfig->addClosureHandler($handler, $event);
     }
 
     public function dispatch(string|object $event): void

packages/event-bus/src/functions.php

@@ -20,10 +20,10 @@ function event(string|object $event): void
     /**
      * Registers a closure-based event listener for the given `$event`.
      */
-    function listen(string|object $event, Closure $handler): void
+    function listen(Closure $handler, ?string $event = null): void
     {
         $config = get(EventBusConfig::class);
 
-        $config->addClosureHandler($event, $handler);
+        $config->addClosureHandler($handler, $event);
     }
 }

packages/event-bus/tests/EventBusTest.php

@@ -126,15 +126,32 @@ public function test_closure_based_handlers_using_listen_method(): void
         $hasHappened = false;
 
         // @mago-expect best-practices/no-unused-parameter
-        $eventBus->listen('my-event', function (string $event) use (&$hasHappened): void {
+        $eventBus->listen(function (string $event) use (&$hasHappened): void {
             $hasHappened = true;
-        });
+        }, event: 'my-event');
 
         $eventBus->dispatch('my-event');
 
         $this->assertTrue($hasHappened);
     }
 
+    public function test_closure_based_handlers_using_listen_method_and_first_parameter(): void
+    {
+        $container = new GenericContainer();
+        $config = new EventBusConfig();
+        $eventBus = new GenericEventBus($container, $config);
+        $hasHappened = false;
+
+        // @mago-expect best-practices/no-unused-parameter
+        $eventBus->listen(function (ItHappened $event) use (&$hasHappened): void {
+            $hasHappened = true;
+        });
+
+        $eventBus->dispatch(new ItHappened());
+
+        $this->assertTrue($hasHappened);
+    }
+
     public function test_closure_based_handlers_using_function(): void
     {
         GenericContainer::setInstance($container = new GenericContainer());
@@ -145,9 +162,9 @@ public function test_closure_based_handlers_using_function(): void
         $hasHappened = false;
 
         // @mago-expect best-practices/no-unused-parameter
-        listen('my-event', function (string $event) use (&$hasHappened): void {
+        listen(function (string $event) use (&$hasHappened): void {
             $hasHappened = true;
-        });
+        }, event: 'my-event');
 
         get(EventBus::class)->dispatch('my-event');