Merge branch 'main' into feat/console/make-migration-command

Author: gturpin-dev

composer.json

@@ -128,6 +128,7 @@
             "src/Tempest/Support/src/Html/functions.php",
             "src/Tempest/Support/src/Language/functions.php",
             "src/Tempest/Support/src/Namespace/functions.php",
+            "src/Tempest/Support/src/Path/functions.php",
             "src/Tempest/Support/src/Random/functions.php",
             "src/Tempest/Support/src/Regex/functions.php",
             "src/Tempest/Support/src/Str/functions.php",

phpstan.neon.dist

@@ -20,9 +20,6 @@ parameters:
 	ignoreErrors:
 		-
 			identifier: argument.named
-		-
-			message: '#.*#'
-			path: src/Tempest/Router/src/Exceptions/exception.php
 		-
 		    message: '#.*exec*#'
 		    path: src/Tempest/Console/src/Terminal/Terminal.php

rector.php

@@ -58,8 +58,6 @@
         EncapsedStringsToSprintfRector::class,
         AddArrowFunctionReturnTypeRector::class,
     ])
-    ->withSkipPath(__DIR__ . '/src/Tempest/Router/src/Exceptions/HttpProductionErrorHandler.php')
-    ->withSkipPath(__DIR__ . '/src/Tempest/Router/src/Exceptions/exception.php')
     ->withParallel(300, 10, 10)
     ->withPreparedSets(
         codeQuality: false,

src/Tempest/Console/src/Highlight/TempestConsoleLanguage/Injections/FileInjection.php

@@ -23,7 +23,7 @@ public function parse(string $content, Highlighter $highlighter): ParsedInjectio
                 $href = $matches['file'];
                 $exists = realpath($href) !== false;
                 $file = $exists
-                    ? str(realpath($href))->replace('\\', '/')->replaceStart(root_path('/'), '')
+                    ? str(realpath($href))->replace('\\', '/')->stripStart(root_path())->stripStart('/')
                     : $href;
 
                 return TerminalStyle::UNDERLINE((string) $file);

src/Tempest/Console/src/Input/MemoryInputBuffer.php

@@ -52,4 +52,11 @@ private function consumeBuffer(): string
 
         return $next ?? '';
     }
+
+    public function clear(): self
+    {
+        $this->buffer = [];
+
+        return $this;
+    }
 }

src/Tempest/Console/src/Testing/ConsoleTester.php

@@ -35,6 +35,8 @@ final class ConsoleTester
 
     private bool $withPrompting = true;
 
+    private (Console&GenericConsole)|null $console = null;
+
     public function __construct(
         private readonly Container $container,
     ) {}
@@ -43,20 +45,26 @@ public function call(string|Closure|array $command, string|array $arguments = []
     {
         $clone = clone $this;
 
-        $memoryOutputBuffer = new MemoryOutputBuffer();
+        $this->output ??= new MemoryOutputBuffer();
+        $this->output->clear();
+        $memoryOutputBuffer = $this->output;
         $clone->container->singleton(OutputBuffer::class, $memoryOutputBuffer);
 
-        $memoryInputBuffer = new MemoryInputBuffer();
+        $this->input ??= new MemoryInputBuffer();
+        $this->input->clear();
+        $memoryInputBuffer = $this->input;
         $clone->container->singleton(InputBuffer::class, $memoryInputBuffer);
 
-        $console = new GenericConsole(
+        $this->console ??= new GenericConsole(
             output: $memoryOutputBuffer,
             input: $memoryInputBuffer,
             highlighter: $clone->container->get(Highlighter::class, 'console'),
             executeConsoleCommand: $clone->container->get(ExecuteConsoleCommand::class),
             argumentBag: $clone->container->get(ConsoleArgumentBag::class),
         );
 
+        $console = $this->console;
+
         if ($this->withPrompting === false) {
             $console->disablePrompting();
         }

src/Tempest/Core/src/Composer.php

@@ -4,15 +4,20 @@
 
 namespace Tempest\Core;
 
+use Tempest\Support\Namespace\Psr4Namespace;
+
 use function Tempest\Support\arr;
-use function Tempest\Support\path;
+use function Tempest\Support\Arr\wrap;
+use function Tempest\Support\Path\normalize;
+use function Tempest\Support\Str\ensure_ends_with;
+use function Tempest\Support\Str\starts_with;
 
 final class Composer
 {
-    /** @var array<ComposerNamespace> */
+    /** @var array<Psr4Namespace> */
     public array $namespaces;
 
-    public ?ComposerNamespace $mainNamespace = null;
+    public ?Psr4Namespace $mainNamespace = null;
 
     private string $composerPath;
 
@@ -25,16 +30,17 @@ public function __construct(
 
     public function load(): self
     {
-        $this->composerPath = path($this->root, 'composer.json')->toString();
+        $this->composerPath = normalize($this->root, 'composer.json');
         $this->composer = $this->loadComposerFile($this->composerPath);
         $this->namespaces = arr($this->composer)
             ->get('autoload.psr-4', default: arr())
-            ->map(fn (string $path, string $namespace) => new ComposerNamespace($namespace, $path))
+            ->map(fn (string $path, string $namespace) => new Psr4Namespace($namespace, $path))
+            ->sortByCallback(fn (Psr4Namespace $ns1, Psr4Namespace $ns2) => strlen($ns1->path) <=> strlen($ns2->path))
             ->values()
             ->toArray();
 
         foreach ($this->namespaces as $namespace) {
-            if (str_starts_with($namespace->path, 'app/') || str_starts_with($namespace->path, 'src/')) {
+            if (starts_with(ensure_ends_with($namespace->path, '/'), ['app/', 'src/', 'source/', 'lib/'])) {
                 $this->mainNamespace = $namespace;
 
                 break;
@@ -45,16 +51,31 @@ public function load(): self
             $this->mainNamespace = $this->namespaces[0];
         }
 
+        $this->namespaces = arr([
+            $this->mainNamespace,
+            ...$this->namespaces,
+        ])
+            ->filter()
+            ->unique(fn (Psr4Namespace $ns) => $ns->namespace)
+            ->toArray();
+
         return $this;
     }
 
-    public function setMainNamespace(ComposerNamespace $namespace): self
+    public function setMainNamespace(Psr4Namespace $namespace): self
     {
         $this->mainNamespace = $namespace;
 
         return $this;
     }
 
+    public function setNamespaces(Psr4Namespace|array $namespaces): self
+    {
+        $this->namespaces = wrap($namespaces);
+
+        return $this;
+    }
+
     public function setShellExecutor(ShellExecutor $executor): self
     {
         $this->executor = $executor;

src/Tempest/Core/src/ComposerNamespace.php

@@ -14,7 +14,6 @@
 use Tempest\Core\Kernel\LoadDiscoveryLocations;
 use Tempest\Core\ShellExecutors\GenericShellExecutor;
 use Tempest\EventBus\EventBus;
-use Tempest\Router\Exceptions\HttpProductionErrorHandler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;
 
@@ -51,8 +50,9 @@ public static function boot(
             discoveryLocations: $discoveryLocations,
             container: $container,
         )
+            ->validateRoot()
             ->loadEnv()
-            ->registerKernelErrorHandler()
+            ->registerEmergencyErrorHandler()
             ->registerShutdownFunction()
             ->registerInternalStorage()
             ->registerKernel()
@@ -64,6 +64,19 @@ public static function boot(
             ->event(KernelEvent::BOOTED);
     }
 
+    public function validateRoot(): self
+    {
+        $root = realpath($this->root);
+
+        if (! is_dir($root)) {
+            throw new \RuntimeException('The specified root directory is not valid.');
+        }
+
+        $this->root = $root;
+
+        return $this;
+    }
+
     public function shutdown(int|string $status = ''): never
     {
         $this->finishDeferredTasks()
@@ -150,27 +163,6 @@ public function loadConfig(): self
         return $this;
     }
 
-    public function registerErrorHandler(): self
-    {
-        $appConfig = $this->container->get(AppConfig::class);
-
-        if ($appConfig->environment->isTesting()) {
-            return $this;
-        }
-
-        if (PHP_SAPI === 'cli') {
-            $handler = $this->container->get(ConsoleErrorHandler::class);
-            set_exception_handler($handler->handleException(...));
-            set_error_handler($handler->handleError(...)); // @phpstan-ignore-line
-        } elseif ($appConfig->environment->isProduction()) {
-            $handler = $this->container->get(HttpProductionErrorHandler::class);
-            set_exception_handler($handler->handleException(...));
-            set_error_handler($handler->handleError(...)); // @phpstan-ignore-line
-        }
-
-        return $this;
-    }
-
     public function registerInternalStorage(): self
     {
         $path = $this->root . '/vendor/.tempest';
@@ -200,24 +192,44 @@ public function event(object $event): self
         return $this;
     }
 
-    public function registerKernelErrorHandler(): self
+    public function registerEmergencyErrorHandler(): self
     {
         $environment = Environment::fromEnv();
 
+        // During tests, PHPUnit registers its own error handling.
         if ($environment->isTesting()) {
             return $this;
         }
 
-        if (PHP_SAPI !== 'cli' && $environment->isProduction()) {
-            $handler = new HttpProductionErrorHandler();
-            set_exception_handler($handler->handleException(...));
-            set_error_handler($handler->handleError(...)); // @phpstan-ignore-line
-        } elseif (PHP_SAPI !== 'cli') {
+        // In development, we want to register a developer-friendly error
+        // handler as soon as possible to catch any kind of exception.
+        if (PHP_SAPI !== 'cli' && ! $environment->isProduction()) {
             $whoops = new Run();
             $whoops->pushHandler(new PrettyPageHandler());
             $whoops->register();
         }
 
         return $this;
     }
+
+    public function registerErrorHandler(): self
+    {
+        $appConfig = $this->container->get(AppConfig::class);
+
+        // During tests, PHPUnit registers its own error handling.
+        if ($appConfig->environment->isTesting()) {
+            return $this;
+        }
+
+        // We already have a non-CLI error handler.
+        if (PHP_SAPI !== 'cli') {
+            return $this;
+        }
+
+        $handler = $this->container->get(ConsoleErrorHandler::class);
+        set_exception_handler($handler->handleException(...));
+        set_error_handler($handler->handleError(...)); // @phpstan-ignore-line
+
+        return $this;
+    }
 }

src/Tempest/Core/src/FrameworkKernel.php

@@ -4,19 +4,7 @@
 
 namespace Tempest\Core;
 
-use Dotenv\Dotenv;
-use Tempest\Console\Exceptions\ConsoleErrorHandler;
 use Tempest\Container\Container;
-use Tempest\Container\GenericContainer;
-use Tempest\Core\Kernel\FinishDeferredTasks;
-use Tempest\Core\Kernel\LoadConfig;
-use Tempest\Core\Kernel\LoadDiscoveryClasses;
-use Tempest\Core\Kernel\LoadDiscoveryLocations;
-use Tempest\Core\ShellExecutors\GenericShellExecutor;
-use Tempest\EventBus\EventBus;
-use Tempest\Router\Exceptions\HttpProductionErrorHandler;
-use Whoops\Handler\PrettyPageHandler;
-use Whoops\Run;
 
 interface Kernel
 {