[VarDumper] New env var to select the dump format

Author: dunglas

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

@@ -204,7 +204,13 @@ public function __destruct()
                 --$i;
             }
 
-            if (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true) && stripos($h[$i], 'html')) {
+            if (isset($_SERVER['VAR_DUMPER_FORMAT'])) {
+                $html = 'html' === $_SERVER['VAR_DUMPER_FORMAT'];
+            } else {
+                $html = !\in_array(PHP_SAPI, array('cli', 'phpdbg'), true) && stripos($h[$i], 'html');
+            }
+
+            if ($html) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
                 $dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
             } else {

src/Symfony/Component/VarDumper/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.2.0
+-----
+
+ * support selecting the format to use by setting the environment variable `VAR_DUMPER_FORMAT` to `html` or `cli`
+
 4.1.0
 -----
 

src/Symfony/Component/VarDumper/VarDumper.php

@@ -27,15 +27,20 @@ class VarDumper
 
     public static function dump($var)
     {
-        if (null === self::$handler) {
-            $cloner = new VarCloner();
-            $dumper = \in_array(PHP_SAPI, array('cli', 'phpdbg'), true) ? new CliDumper() : new HtmlDumper();
-            self::$handler = function ($var) use ($cloner, $dumper) {
-                $dumper->dump($cloner->cloneVar($var));
-            };
+        if (null !== self::$handler) {
+            return \call_user_func(self::$handler, $var);
         }
 
-        return call_user_func(self::$handler, $var);
+        $cloner = new VarCloner();
+        if (isset($_SERVER['VAR_DUMPER_FORMAT'])) {
+            $dumper = 'html' === $_SERVER['VAR_DUMPER_FORMAT'] ? new HtmlDumper() : new CliDumper();
+        } else {
+            $dumper = \in_array(PHP_SAPI, array('cli', 'phpdbg')) ? new CliDumper() : new HtmlDumper();
+        }
+
+        self::$handler = function ($var) use ($cloner, $dumper) {
+            $dumper->dump($cloner->cloneVar($var));
+        };
     }
 
     public static function setHandler(callable $callable = null)