[VarDumper] Tweak display options implementation

nicolas-grekas · nicolas-grekas · commit c7acc7f77c39 · 2016-06-06T10:05:48.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -46,13 +46,12 @@ class HtmlDumper extends CliDumper
         'str .max-string-length b' => 'color:#A0A0A0',
     );
 
-    protected $displayOptions = array(
+    private $displayOptions = array(
         'initDepth' => 1,
         'maxDepth' => 1,
         'maxStringLength' => 160,
     );
-
-    protected $displayOptionsIsUpdated = false;
+    private $extraDisplayOptions = array();
 
     /**
      * {@inheritdoc}
@@ -87,15 +86,12 @@ public function setStyles(array $styles)
     /**
      * Configures display options.
      *
-     * @param array $displayOptions A map of displayOptions names to customize the behavior.
+     * @param array $displayOptions A map of display options to customize the behavior.
      */
     public function setDisplayOptions(array $displayOptions)
     {
-        if ($displayOptions)
-        {
-            $this->displayOptionsIsUpdated = true;
-            $this->displayOptions = $displayOptions + $this->displayOptions;
-        }
+        $this->headerIsDumped = false;
+        $this->displayOptions = $displayOptions + $this->displayOptions;
     }
 
     /**
@@ -123,9 +119,9 @@ public function setDumpBoundaries($prefix, $suffix)
     /**
      * {@inheritdoc}
      */
-    public function dump(Data $data, $output = null, array $displayOptions = [])
+    public function dump(Data $data, $output = null, array $extraDisplayOptions = array())
     {
-        $this->setDisplayOptions($displayOptions);
+        $this->extraDisplayOptions = $extraDisplayOptions;
         parent::dump($data, $output);
         $this->dumpId = 'sf-dump-'.mt_rand();
     }
@@ -141,7 +137,7 @@ protected function getDumpHeader()
             return $this->dumpHeader;
         }
 
-        $line = <<<'EOHTML'
+        $line = str_replace('{$options}', json_encode($this->displayOptions, JSON_FORCE_OBJECT), <<<'EOHTML'
 <script>
 Sfdump = window.Sfdump || (function (doc) {
 
@@ -218,13 +214,9 @@ function getLevelNodeForParent(parentNode, currentNode, level) {
     return getLevelNodeForParent(parentNode, currentNode, level);
 }
 
-return function (root, options) {
+return function (root, extraOptions) {
     root = doc.getElementById(root);
-EOHTML;
 
-    $line .= 'options = options || '.json_encode($this->displayOptions).';';
-
-    $line .= <<<'EOHTML'
     function a(e, f) {
         addEventListener(root, e, function (e) {
             if ('A' == e.target.tagName) {
@@ -285,6 +277,7 @@ function isCtrlKey(e) {
     });
 
     var indentRx = new RegExp('^('+(root.getAttribute('data-indent-pad') || '  ').replace(rxEsc, '\\$1')+')+', 'm'),
+        options = {$options},
         elt = root.getElementsByTagName('A'),
         len = elt.length,
         i = 0,
@@ -293,6 +286,10 @@ function isCtrlKey(e) {
 
     while (i < len) t.push(elt[i++]);
 
+    for (i in extraOptions) {
+        options[i] = $extraOptions[i];
+    }
+
     elt = root.getElementsByTagName('SAMP');
     len = elt.length;
     i = 0;
@@ -378,7 +375,7 @@ function toggleMaxStringLength(elt) {
 
             if (elt.className == 'max-string-length expanded') {
                 elt.className = 'max-string-length collapsed';
-            }else{
+            } else {
                 elt.className = 'max-string-length expanded';
             }
         }
@@ -411,15 +408,16 @@ function toggleMaxStringLength(elt) {
     outline: none;
 }
 pre.sf-dump .max-string-length.expanded .collapsed {
-    display:none;
+    display: none;
 }
 pre.sf-dump .max-string-length.collapsed .expanded {
-    display:none
+    display: none;
 }
 pre.sf-dump .max-string-length b {
     cursor: pointer;
 }
-EOHTML;
+EOHTML
+        );
 
         foreach ($this->styles as $class => $style) {
             $line .= 'pre.sf-dump'.('default' !== $class ? ' .sf-dump-'.$class : '').'{'.$style.'}';
@@ -536,7 +534,7 @@ protected function dumpLine($depth, $endOfValue = false)
             $this->line .= sprintf(
                 $this->dumpSuffix,
                 $this->dumpId,
-                $this->displayOptionsIsUpdated ? ','.json_encode($this->displayOptions) : ''
+                $this->extraDisplayOptions ? ','.json_encode($this->extraDisplayOptions, JSON_FORCE_OBJECT) : ''
             );
         }
         $this->lastDepth = $depth;
