[TwigBundle/DebugBundle] move dump extension & cleanups

Author: nicolas-grekas

Dumper/AbstractDumper.php

@@ -115,7 +115,7 @@ public function dump(Data $data, $output = null)
      */
     protected function dumpLine($depth)
     {
-        call_user_func($this->lineDumper, $this->line, $depth);
+        call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
         $this->line = '';
     }
 
@@ -125,10 +125,10 @@ protected function dumpLine($depth)
      * @param string $line  The line to write.
      * @param int    $depth The recursive depth in the dumped structure.
      */
-    protected function echoLine($line, $depth)
+    protected function echoLine($line, $depth, $indentPad)
     {
         if (-1 !== $depth) {
-            fwrite($this->outputStream, str_repeat($this->indentPad, $depth).$line."\n");
+            fwrite($this->outputStream, str_repeat($indentPad, $depth).$line."\n");
         }
     }
 }

Dumper/HtmlDumper.php

@@ -51,9 +51,11 @@ class HtmlDumper extends CliDumper
      */
     public function setOutput($output)
     {
-        $this->headerIsDumped = false;
+        if ($output !== $prev = parent::setOutput($output)) {
+            $this->headerIsDumped = false;
+        }
 
-        return parent::setOutput($output);
+        return $prev;
     }
 
     /**