[VarDumper] New env var to select the dump format

symfony · Sep 4, 2018 · 89d3d3c · 89d3d3c
1 parent 18423a6
commit 89d3d3c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/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
 -----
 

diff --git a/VarDumper.php b/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)