Add functional test for ServerDumpCommand

louismariegaborit · louismariegaborit · commit e1f653693945 · 2024-02-02T23:21:51.000+01:00
diff --git a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php
@@ -85,15 +85,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $errorIo = $io->getErrorStyle();
         $errorIo->title('Symfony Var Dumper Server');
-
-        $this->server->start();
-
         $errorIo->success(sprintf('Server listening on %s', $this->server->getHost()));
         $errorIo->comment('Quit the server with CONTROL-C.');
-
-        $this->server->listen(function (Data $data, array $context, int $clientId) use ($descriptor, $io) {
-            $descriptor->describe($io, $data, $context, $clientId);
-        });
+        $this->server->listen(
+            function (Data $data, array $context, int $clientId) use ($descriptor, $io) {
+                $descriptor->describe($io, $data, $context, $clientId);
+            },
+            $input,
+        );
 
         return 0;
     }
diff --git a/src/Symfony/Component/VarDumper/Server/DumpServer.php b/src/Symfony/Component/VarDumper/Server/DumpServer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\VarDumper\Server;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
@@ -32,6 +33,11 @@ class DumpServer
      */
     private $socket;
 
+    /**
+     * @var resource|null
+     */
+    private $inputStream;
+
     public function __construct(string $host, ?LoggerInterface $logger = null)
     {
         if (!str_contains($host, '://')) {
@@ -49,9 +55,12 @@ public function start(): void
         }
     }
 
-    public function listen(callable $callback): void
+    public function listen(callable $callback, ?StreamableInputInterface $streamInput): void
     {
-        if (null === $this->socket) {
+        var_dump($streamInput instanceof StreamableInputInterface);
+        if ($streamInput instanceof StreamableInputInterface && $stream = $streamInput->getStream()) {
+            $this->inputStream = $stream;
+        } elseif (null === $this->socket) {
             $this->start();
         }
 
@@ -86,22 +95,29 @@ public function getHost(): string
 
     private function getMessages(): iterable
     {
-        $sockets = [(int) $this->socket => $this->socket];
-        $write = [];
-
-        while (true) {
-            $read = $sockets;
-            stream_select($read, $write, $write, null);
-
-            foreach ($read as $stream) {
-                if ($this->socket === $stream) {
-                    $stream = stream_socket_accept($this->socket);
-                    $sockets[(int) $stream] = $stream;
-                } elseif (feof($stream)) {
-                    unset($sockets[(int) $stream]);
-                    fclose($stream);
-                } else {
-                    yield (int) $stream => fgets($stream);
+        if (null !== $inputStream = $this->inputStream) {
+            while (!feof($inputStream)) {
+                $stream = fgets($inputStream);
+                yield (int) $stream => $stream;
+            }
+        } else {
+            $sockets = [(int) $this->socket => $this->socket];
+            $write = [];
+
+            while (true) {
+                $read = $sockets;
+                stream_select($read, $write, $write, null);
+
+                foreach ($read as $stream) {
+                    if ($this->socket === $stream) {
+                        $stream = stream_socket_accept($this->socket);
+                        $sockets[(int) $stream] = $stream;
+                    } elseif (feof($stream)) {
+                        unset($sockets[(int) $stream]);
+                        fclose($stream);
+                    } else {
+                        yield (int) $stream => fgets($stream);
+                    }
                 }
             }
         }
diff --git a/src/Symfony/Component/VarDumper/Tests/Command/ServerDumpCommandTest.php b/src/Symfony/Component/VarDumper/Tests/Command/ServerDumpCommandTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Command\ServerDumpCommand;
 use Symfony\Component\VarDumper\Server\DumpServer;
 
@@ -28,6 +30,24 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
+    public function testServerDumpSuccess()
+    {
+        $command = $this->createCommand();
+        $commandTester = new CommandTester($command);
+
+        $data = new Data([['my dump']]);
+        $input = base64_encode(serialize([$data, ['timestamp' => time(), 'source' => ['name' => 'sourceName', 'line' => 222, 'file' => 'myFile']]]))."\n";
+
+        $commandTester->setInputs([$input]);
+
+        $commandTester->execute(['--format' => 'html']);
+
+        $commandTester->assertCommandIsSuccessful();
+
+        $output = $commandTester->getDisplay();
+        $this->assertStringContainsString('my dump', $output);
+    }
+
     public static function provideCompletionSuggestions()
     {
         yield 'option --format' => [
@@ -38,6 +58,6 @@ public static function provideCompletionSuggestions()
 
     private function createCommand(): ServerDumpCommand
     {
-        return new ServerDumpCommand($this->createMock(DumpServer::class));
+        return new ServerDumpCommand(new DumpServer(''));
     }
 }
