Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>

src/Console/Commander.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Console\Concerns\InteractsWithSignals;
-use Illuminate\Console\Signals;
 use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Filesystem\Filesystem;
@@ -15,6 +14,7 @@
 use Orchestra\Testbench\Foundation\Bootstrap\LoadMigrationsFromArray;
 use Orchestra\Testbench\Foundation\Config;
 use Orchestra\Testbench\Foundation\Console\Concerns\CopyTestbenchFiles;
+use Orchestra\Testbench\Foundation\Console\Signals;
 use Orchestra\Testbench\Foundation\TestbenchServiceProvider;
 use Orchestra\Testbench\Workbench\Workbench;
 use Symfony\Component\Console\Application as ConsoleApplication;
@@ -253,6 +253,25 @@ protected function prepareCommandSignals(): void
                         exit($status);
                     })
                 );
+        }, function () {
+            if (windows_os() && PHP_SAPI === 'cli' && \function_exists('sapi_windows_set_ctrl_handler')) {
+                sapi_windows_set_ctrl_handler(function ($event) {
+                    $this->handleTerminatingConsole();
+                    Workbench::flush();
+
+                    $status = match ($event) {
+                        PHP_WINDOWS_EVENT_CTRL_C => 572,
+                        PHP_WINDOWS_EVENT_CTRL_BREAK => 572,
+                        default => 0,
+                    };
+
+                    if (\in_array($status, [0])) {
+                        exit;
+                    }
+
+                    exit($status);
+                });
+            }
         });
     }
 }

src/Foundation/Console/Concerns/HandleTerminatingConsole.php

@@ -35,5 +35,7 @@ protected function handleTerminatingConsole(): void
             ->each(static function ($callback) {
                 \call_user_func($callback);
             });
+
+        $this->beforeTerminatingCallbacks = [];
     }
 }

src/Foundation/Console/ServeCommand.php

@@ -3,7 +3,6 @@
 namespace Orchestra\Testbench\Foundation\Console;
 
 use Composer\Config as ComposerConfig;
-use Illuminate\Console\Signals;
 use Illuminate\Foundation\Console\ServeCommand as Command;
 use Orchestra\Testbench\Foundation\Events\ServeCommandEnded;
 use Orchestra\Testbench\Foundation\Events\ServeCommandStarted;

src/Foundation/Console/Signals.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Orchestra\Testbench\Foundation\Console;
+
+class Signals extends \Illuminate\Console\Signals
+{
+    /**
+     * Execute the given callback if "signals" should be used and are available.
+     *
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return void
+     */
+    #[\Override]
+    public static function whenAvailable($callback, $default = null)
+    {
+        if (\is_null($resolver = static::$availabilityResolver)) {
+            return;
+        }
+
+        if ($resolver()) {
+            $callback();
+        } elseif (\is_callable($default)) {
+            $default();
+        }
+    }
+}

tests/Integrations/ArtisanTest.php

@@ -25,6 +25,7 @@ public function it_can_generate_the_same_output()
         $artisan = (new Process(
             command: [$phpBinary, 'artisan', '--version', '--no-ansi'],
             cwd: package_path('laravel'),
+            env: ['TESTBENCH_WORKING_PATH' => package_path()],
         ))->mustRun();
 
         $this->assertSame(json_decode($artisan->getOutput(), true), json_decode($remote->getOutput(), true));

tests/TestCaseTest.php

@@ -46,6 +46,8 @@ public function it_can_create_the_testcase()
         $this->assertInstanceOf(TestCaseContract::class, $testbench);
         $this->assertTrue($testbench->isRunningTestCase());
         $this->assertFalse($testbench->isRunningTestCaseUsingPest());
+
+        $app->terminate();
     }
 
     /** @test */
@@ -65,5 +67,8 @@ public function it_can_create_a_container()
         $this->assertInstanceOf(ConfigRepository::class, $app['config']);
 
         $this->assertFalse($container->isRunningTestCase());
+        $this->assertFalse($container->isRunningTestCaseUsingPest());
+
+        $app->terminate();
     }
 }