symfony · louismariegaborit · Feb 2, 2024 · nicolas-grekas · Feb 22, 2024 · louismariegaborit
diff --git a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor;
 use Symfony\Component\VarDumper\Command\Descriptor\DumpDescriptorInterface;
 use Symfony\Component\VarDumper\Command\Descriptor\HtmlDescriptor;
@@ -85,15 +86,25 @@ 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 (int $clientId, string $message) use ($descriptor, $io) {
+                $payload = @unserialize(base64_decode($message), ['allowed_classes' => [Data::class, Stub::class]]);
+
+                // Impossible to decode the message, give up.
+                if (false === $payload) {
+                    return;
+                }
+
+                if (!\is_array($payload) || \count($payload) < 2 || !$payload[0] instanceof Data || !\is_array($payload[1])) {
+                    return;
+                }
+                [$data, $context] = $payload;
+                $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;
 
@@ -49,33 +50,20 @@ public function start(): void
         }
     }
 
-    public function listen(callable $callback): void
+    public function listen(callable $callback, ?StreamableInputInterface $streamInput = null): void
     {
-        if (null === $this->socket) {
+        $inputStream = null;
+
+        if ($streamInput instanceof StreamableInputInterface && $stream = $streamInput->getStream()) {
+            $inputStream = $stream;
+        } elseif (null === $this->socket) {
             $this->start();
         }
 
-        foreach ($this->getMessages() as $clientId => $message) {
+        foreach ($this->getMessages($inputStream) as $clientId => $message) {
             $this->logger?->info('Received a payload from client {clientId}', ['clientId' => $clientId]);
 
-            $payload = @unserialize(base64_decode($message), ['allowed_classes' => [Data::class, Stub::class]]);
-
-            // Impossible to decode the message, give up.
-            if (false === $payload) {
-                $this->logger?->warning('Unable to decode a message from {clientId} client.', ['clientId' => $clientId]);
-
-                continue;
-            }
-
-            if (!\is_array($payload) || \count($payload) < 2 || !$payload[0] instanceof Data || !\is_array($payload[1])) {
-                $this->logger?->warning('Invalid payload from {clientId} client. Expected an array of two elements (Data $data, array $context)', ['clientId' => $clientId]);
-
-                continue;
-            }
-
-            [$data, $context] = $payload;
-
-            $callback($data, $context, $clientId);
+            $callback($clientId, $message);
         }
     }
 
@@ -84,8 +72,20 @@ public function getHost(): string
         return $this->host;
     }
 
-    private function getMessages(): iterable
+    /**
+     * @param ?resource
+     */
+    private function getMessages($inputStream): iterable
     {
+        if (null !== $inputStream) {
+            while (!feof($inputStream)) {
+                $stream = fgets($inputStream);
+                yield (int) $stream => $stream;
+            }
+
+            return;
+        }
+
         $sockets = [(int) $this->socket => $this->socket];
         $write = [];
 

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(''));
     }
 }