merge

Author: brendt

.github/workflows/integration-tests.yml

@@ -106,6 +106,7 @@ jobs:
       - if: matrix.php == '8.4' && matrix.database == 'sqlite' && matrix.os == 'ubuntu-latest' && matrix.stability == 'prefer-stable'
         name: Coveralls
         uses: coverallsapp/github-action@v2
+        continue-on-error: true
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
           file: build/reports/clover.xml

.gitignore

@@ -16,3 +16,4 @@ tests/Unit/Log
 log/
 node_modules
 dist
+profile/

composer.json

@@ -13,7 +13,7 @@
         "ext-readline": "*",
         "ext-simplexml": "*",
         "filp/whoops": "^2.15",
-        "giggsey/libphonenumber-for-php": "^8.13.40",
+        "giggsey/libphonenumber-for-php-lite": "^9.0",
         "guzzlehttp/guzzle": "^7.8",
         "laminas/laminas-diactoros": "^3.3",
         "monolog/monolog": "^3.7.0",
@@ -39,9 +39,10 @@
     },
     "require-dev": {
         "aidan-casey/mock-client": "dev-master",
-        "carthage-software/mago": "0.22.0",
+        "carthage-software/mago": "0.22.2",
         "guzzlehttp/psr7": "^2.6.1",
         "illuminate/view": "~11.7.0",
+        "masterminds/html5": "^2.9",
         "mikey179/vfsstream": "^2.0@dev",
         "nesbot/carbon": "^3.8",
         "nyholm/psr7": "^1.8",
@@ -178,8 +179,8 @@
     "scripts": {
         "phpunit": "vendor/bin/phpunit --display-warnings --display-skipped --display-deprecations --display-errors --display-notices",
         "coverage": "vendor/bin/phpunit --coverage-html build/reports/html --coverage-clover build/reports/clover.xml",
-        "mago:fmt": "vendor/bin/mago fmt",
-        "mago:lint": "vendor/bin/mago lint --fix --fmt && vendor/bin/mago lint",
+        "mago:fmt": "vendor/bin/mago fmt && vendor/bin/mago lint --fix --potentially-unsafe --fmt",
+        "mago:lint": "vendor/bin/mago lint --minimum-level=note",
         "phpstan": "vendor/bin/phpstan analyse src tests --memory-limit=1G",
         "rector": "vendor/bin/rector process --no-ansi",
         "merge": "php -d\"error_reporting = E_ALL & ~E_DEPRECATED\" vendor/bin/monorepo-builder merge",
@@ -191,7 +192,7 @@
             "composer mago:fmt",
             "composer merge",
             "./bin/validate-packages",
-            "./tempest discovery:clear",
+            "./tempest discovery:clear --no-interaction",
             "composer rector",
             "composer phpunit",
             "composer mago:lint",

phpstan.neon.dist

@@ -29,8 +29,6 @@ parameters:
 		    message: '#.*uninitialized readonly property \$composer*#'
 		-
 		    message: '#.*uninitialized readonly property \$stubFileGenerator*#'
-		-
-		    message: '#.*undefined property Dom*#'
 		-
 		    message: '#.*undefined method Dom*#'
 

rector.php

@@ -37,7 +37,6 @@
         ],
     ])
     ->withRules([
-        ParenthesizeNestedTernaryRector::class,
         ExplicitNullableParamTypeRector::class,
     ])
     ->withSkip([

src/Tempest/Auth/src/AuthBootstrap.php

@@ -5,13 +5,15 @@
 namespace Tempest\Auth;
 
 use Tempest\Container\Container;
+use Tempest\Core\Priority;
 use Tempest\Router\HttpMiddleware;
 use Tempest\Router\HttpMiddlewareCallable;
 use Tempest\Router\MatchedRoute;
 use Tempest\Router\Request;
 use Tempest\Router\Response;
 use Tempest\Router\Responses\Forbidden;
 
+#[Priority(Priority::HIGHEST)]
 final readonly class AuthorizerMiddleware implements HttpMiddleware
 {
     public function __construct(

src/Tempest/Auth/src/AuthorizerMiddleware.php

@@ -5,23 +5,16 @@
 namespace Tempest\CommandBus;
 
 use Symfony\Component\Uid\Uuid;
-use Tempest\Core\KernelEvent;
-use Tempest\EventBus\EventHandler;
+use Tempest\Core\Priority;
 use Tempest\Reflection\ClassReflector;
 
+#[Priority(Priority::FRAMEWORK)]
 final readonly class AsyncCommandMiddleware implements CommandBusMiddleware
 {
     public function __construct(
-        private CommandBusConfig $commandBusConfig,
         private CommandRepository $repository,
     ) {}
 
-    #[EventHandler(KernelEvent::BOOTED)]
-    public function onBooted(): void
-    {
-        $this->commandBusConfig->addMiddleware(self::class);
-    }
-
     public function __invoke(object $command, CommandBusMiddlewareCallable $next): void
     {
         $reflector = new ClassReflector($command);

src/Tempest/CommandBus/src/AsyncCommandMiddleware.php

@@ -5,6 +5,7 @@
 namespace Tempest\CommandBus;
 
 use Tempest\CommandBus\AsyncCommandRepositories\FileCommandRepository;
+use Tempest\Core\Middleware;
 use Tempest\Reflection\MethodReflector;
 
 final class CommandBusConfig
@@ -13,8 +14,8 @@ public function __construct(
         /** @var \Tempest\CommandBus\CommandHandler[] */
         public array $handlers = [],
 
-        /** @var array<array-key, class-string<\Tempest\CommandBus\CommandBusMiddleware>> */
-        public array $middleware = [],
+        /** @var Middleware<\Tempest\CommandBus\CommandBusMiddleware> */
+        public Middleware $middleware = new Middleware(),
 
         /** @var class-string<\Tempest\CommandBus\CommandRepository> $commandRepositoryClass */
         public string $commandRepositoryClass = FileCommandRepository::class,
@@ -35,12 +36,4 @@ public function addHandler(CommandHandler $commandHandler, string $commandName,
 
         return $this;
     }
-
-    /** @param class-string<\Tempest\CommandBus\CommandBusMiddleware> $middlewareClass */
-    public function addMiddleware(string $middlewareClass): self
-    {
-        $this->middleware[] = $middlewareClass;
-
-        return $this;
-    }
 }

src/Tempest/CommandBus/src/CommandBusConfig.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tempest\CommandBus;
+
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class CommandBusMiddlewareDiscovery implements Discovery
+{
+    use IsDiscovery;
+
+    public function __construct(
+        private readonly CommandBusConfig $commandBusConfig,
+    ) {}
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+        if ($class->implements(CommandBusMiddleware::class)) {
+            $this->discoveryItems->add($location, $class->getName());
+        }
+    }
+
+    public function apply(): void
+    {
+        $this->commandBusConfig->middleware->add(...$this->discoveryItems);
+    }
+}