Merge pull request #36 from sj-i/restore_stty_settings

restore the state of stty

src/Command/Inspector/DaemonCommand.php

@@ -24,6 +24,7 @@
 use PhpProfiler\Inspector\Settings\GetTraceSettings\GetTraceSettingsFromConsoleInput;
 use PhpProfiler\Inspector\Settings\TargetPhpSettings\TargetPhpSettingsFromConsoleInput;
 use PhpProfiler\Inspector\Settings\TraceLoopSettings\TraceLoopSettingsFromConsoleInput;
+use PhpProfiler\Lib\Console\EchoBackCanceller;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -98,7 +99,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $get_trace_settings
         );
 
-        exec('stty -icanon -echo');
+        $echo_back_canceler = new EchoBackCanceller();
 
         Loop::onReadable(
             STDIN,

src/Inspector/TraceLoopProvider.php

@@ -14,6 +14,7 @@
 namespace PhpProfiler\Inspector;
 
 use PhpProfiler\Inspector\Settings\TraceLoopSettings\TraceLoopSettings;
+use PhpProfiler\Lib\Console\EchoBackCanceller;
 use PhpProfiler\Lib\Loop\Loop;
 use PhpProfiler\Lib\Loop\LoopBuilder;
 use PhpProfiler\Lib\Loop\LoopMiddleware\CallableMiddleware;
@@ -35,7 +36,7 @@ public function getMainLoop(callable $main, TraceLoopSettings $settings): Loop
     {
         return $this->loop_builder
             ->addProcess(RetryOnExceptionMiddleware::class, [$settings->max_retries, [MemoryReaderException::class]])
-            ->addProcess(KeyboardCancelMiddleware::class, [$settings->cancel_key])
+            ->addProcess(KeyboardCancelMiddleware::class, [$settings->cancel_key, new EchoBackCanceller()])
             ->addProcess(NanoSleepMiddleware::class, [$settings->sleep_nano_seconds])
             ->addProcess(CallableMiddleware::class, [$main])
             ->build();

src/Lib/Console/EchoBackCanceller.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the sj-i/php-profiler package.
+ *
+ * (c) sji <sji@sj-i.dev>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace PhpProfiler\Lib\Console;
+
+final class EchoBackCanceller
+{
+    private ?string $stty_settings;
+
+    public function __construct()
+    {
+        /** @psalm-suppress ForbiddenCode */
+        $this->stty_settings = shell_exec('stty -g');
+        exec('stty -icanon -echo');
+    }
+
+    public function __destruct()
+    {
+        if (isset($this->stty_settings)) {
+            exec('stty ' . $this->stty_settings);
+        } else {
+            exec('stty icanon echo');
+        }
+    }
+}

src/Lib/Loop/LoopMiddleware/KeyboardCancelMiddleware.php

@@ -13,6 +13,7 @@
 
 namespace PhpProfiler\Lib\Loop\LoopMiddleware;
 
+use PhpProfiler\Lib\Console\EchoBackCanceller;
 use PhpProfiler\Lib\Loop\LoopMiddlewareInterface;
 
 final class KeyboardCancelMiddleware implements LoopMiddlewareInterface
@@ -21,14 +22,18 @@ final class KeyboardCancelMiddleware implements LoopMiddlewareInterface
     private string $cancel_key;
     /** @var resource */
     private $keyboard_input;
+    private EchoBackCanceller $echo_back_canceller;
 
-    public function __construct(string $cancel_key, LoopMiddlewareInterface $chain)
-    {
+    public function __construct(
+        string $cancel_key,
+        EchoBackCanceller $echo_back_canceller,
+        LoopMiddlewareInterface $chain
+    ) {
         $this->chain = $chain;
-        exec('stty -icanon -echo');
         $this->keyboard_input = fopen('php://stdin', 'r');
         stream_set_blocking($this->keyboard_input, false);
         $this->cancel_key = $cancel_key;
+        $this->echo_back_canceller = $echo_back_canceller;
     }
 
     public function invoke(): bool