Merge branch '9.x' into 10.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

Author: crynobone

CHANGELOG-9.x.md

@@ -2,6 +2,15 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 9.21.0
+
+Released: 2026-03-24
+
+### Changes
+
+* Add `TESTBENCH_USER_MODEL` environment variable when running `serve` command.
+* Utilise `Orchestra\Testbench\Foundation\Console\TerminatingConsole` when running `serve`.
+
 ## 9.20.0
 
 Released: 2026-03-18

src/Console/Commander.php

@@ -262,7 +262,7 @@ protected function prepareCommandSignals(): void
             (new Collection(Arr::wrap([SIGTERM, SIGINT, SIGHUP, SIGUSR1, SIGUSR2, SIGQUIT])))
                 ->each(
                     fn ($signal) => $this->signals->register($signal, function () use ($signal) {
-                        TerminatingConsole::handle();
+                        TerminatingConsole::handle($signal);
                         Workbench::flush();
 
                         $status = match ($signal) {

src/Foundation/Console/ServeCommand.php

@@ -3,9 +3,11 @@
 namespace Orchestra\Testbench\Foundation\Console;
 
 use Composer\Config as ComposerConfig;
+use Illuminate\Foundation\Auth\User;
 use Illuminate\Foundation\Console\ServeCommand as Command;
 use Orchestra\Testbench\Foundation\Events\ServeCommandEnded;
 use Orchestra\Testbench\Foundation\Events\ServeCommandStarted;
+use Orchestra\Testbench\Workbench\Workbench;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Process\Process;
@@ -40,9 +42,8 @@ class_exists(ComposerConfig::class, false)
             $this->phpServerWorkers = $workers;
         }
 
-        $_ENV['TESTBENCH_WORKING_PATH'] = package_path();
-
-        static::$passthroughVariables[] = 'TESTBENCH_WORKING_PATH';
+        $this->addPassThroughEnvironmentVariable('TESTBENCH_WORKING_PATH', package_path());
+        $this->addPassThroughEnvironmentVariable('TESTBENCH_USER_MODEL', Workbench::applicationUserModel() ?? User::class);
 
         event(new ServeCommandStarted($input, $output, $this->components));
 
@@ -51,14 +52,26 @@ class_exists(ComposerConfig::class, false)
         });
     }
 
+    /**
+     * Add an environment variable that should be passed through to the server process.
+     *
+     * @param  string  $name
+     * @param  mixed  $value
+     * @return void
+     */
+    protected function addPassThroughEnvironmentVariable(string $name, mixed $value): void
+    {
+        $_ENV[$name] = $value;
+
+        static::$passthroughVariables[] = $name;
+    }
+
     /** {@inheritDoc} */
     #[\Override]
     protected function startProcess($hasEnvironment)
     {
         return tap(parent::startProcess($hasEnvironment), function (Process $process) {
-            $this->untrap();
-
-            $this->trap(fn () => [SIGTERM, SIGINT, SIGHUP, SIGUSR1, SIGUSR2, SIGQUIT], function ($signal) use ($process) {
+            TerminatingConsole::before(static function ($signal) use ($process) {
                 if ($process->isRunning()) {
                     $process->stop(10, $signal);
                 }

src/Foundation/Console/TerminatingConsole.php

@@ -12,14 +12,14 @@ final class TerminatingConsole
     /**
      * The terminating callbacks.
      *
-     * @var array<int, (callable():void)>
+     * @var array<int, (callable(?int):void)>
      */
     protected static array $beforeTerminatingCallbacks = [];
 
     /**
      * Register a callback to be run before terminating the command.
      *
-     * @param  callable():void  $callback
+     * @param  callable(?int):void  $callback
      * @return void
      */
     public static function before(callable $callback): void
@@ -31,7 +31,7 @@ public static function before(callable $callback): void
      * Register a callback to be run before terminating the command.
      *
      * @param  bool  $condition
-     * @param  callable():void  $callback
+     * @param  callable(?int):void  $callback
      * @return void
      */
     public static function beforeWhen(bool $condition, callable $callback): void
@@ -44,13 +44,14 @@ public static function beforeWhen(bool $condition, callable $callback): void
     /**
      * Handle terminating console.
      *
+     * @param  ?int  $signal
      * @return void
      */
-    public static function handle(): void
+    public static function handle(?int $signal = null): void
     {
         (new Collection(self::$beforeTerminatingCallbacks))
-            ->each(static function ($callback) {
-                \call_user_func($callback);
+            ->each(static function ($callback) use ($signal) {
+                \call_user_func($callback, $signal);
             });
 
         self::flush();