[VarDumper] Fix dumping by splitting Server/Connection out of Dumper/ServerDumper

Author: nicolas-grekas

DependencyInjection/DebugExtension.php

@@ -17,7 +17,6 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\VarDumper\Dumper\ServerDumper;
 
 /**
  * DebugExtension.
@@ -43,20 +42,21 @@ public function load(array $configs, ContainerBuilder $container)
             ->addMethodCall('setMaxString', array($config['max_string_length']));
 
         if (null === $config['dump_destination']) {
-            //no-op
+            $container->getDefinition('var_dumper.command.server_dump')
+                ->setClass(ServerDumpPlaceholderCommand::class)
+            ;
         } elseif (0 === strpos($config['dump_destination'], 'tcp://')) {
-            $serverDumperHost = $config['dump_destination'];
             $container->getDefinition('debug.dump_listener')
-                ->replaceArgument(1, new Reference('var_dumper.server_dumper'))
+                ->replaceArgument(2, new Reference('var_dumper.server_connection'))
             ;
             $container->getDefinition('data_collector.dump')
-                ->replaceArgument(4, new Reference('var_dumper.server_dumper'))
+                ->replaceArgument(4, new Reference('var_dumper.server_connection'))
             ;
             $container->getDefinition('var_dumper.dump_server')
-                ->replaceArgument(0, $serverDumperHost)
+                ->replaceArgument(0, $config['dump_destination'])
             ;
-            $container->getDefinition('var_dumper.server_dumper')
-                ->replaceArgument(0, $serverDumperHost)
+            $container->getDefinition('var_dumper.server_connection')
+                ->replaceArgument(0, $config['dump_destination'])
             ;
         } else {
             $container->getDefinition('var_dumper.cli_dumper')
@@ -65,13 +65,9 @@ public function load(array $configs, ContainerBuilder $container)
             $container->getDefinition('data_collector.dump')
                 ->replaceArgument(4, new Reference('var_dumper.cli_dumper'))
             ;
-        }
-
-        if (!isset($serverDumperHost)) {
-            $container->getDefinition('var_dumper.command.server_dump')->setClass(ServerDumpPlaceholderCommand::class);
-            if (!class_exists(ServerDumper::class)) {
-                $container->removeDefinition('var_dumper.command.server_dump');
-            }
+            $container->getDefinition('var_dumper.command.server_dump')
+                ->setClass(ServerDumpPlaceholderCommand::class)
+            ;
         }
     }
 

Resources/config/services.xml

@@ -23,13 +23,14 @@
             <argument type="service" id="debug.file_link_formatter" on-invalid="ignore"></argument>
             <argument>%kernel.charset%</argument>
             <argument type="service" id="request_stack" />
-            <argument>null</argument><!-- var_dumper.cli_dumper or var_dumper.server_dumper when debug.dump_destination is set -->
+            <argument>null</argument><!-- var_dumper.cli_dumper or var_dumper.server_connection when debug.dump_destination is set -->
         </service>
 
         <service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="var_dumper.cloner" />
             <argument type="service" id="var_dumper.cli_dumper" />
+            <argument>null</argument>
         </service>
 
         <service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" public="true" />
@@ -50,9 +51,8 @@
             </call>
         </service>
 
-        <service id="var_dumper.server_dumper" class="Symfony\Component\VarDumper\Dumper\ServerDumper">
-            <argument>null</argument> <!-- server host -->
-            <argument type="service" id="var_dumper.cli_dumper" />
+        <service id="var_dumper.server_connection" class="Symfony\Component\VarDumper\Server\Connection">
+            <argument /> <!-- server host -->
             <argument type="collection">
                 <argument type="service" key="source">
                     <service class="Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider">

composer.json

@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/twig-bridge": "~3.4|~4.0",
-        "symfony/var-dumper": "~4.1"
+        "symfony/var-dumper": "^4.1.1"
     },
     "require-dev": {
         "symfony/config": "~3.4|~4.0",