Merge branch '2.6' into 2.7

* 2.6:
  Extract an AbstractEventDispatcherTest from EventDispatcherTest and also use it in ContainerAwareEventDispatcherTest
  [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
  be smarter when guessing the document root
  Azerbaijani locale
  Fixed grammar error in docblock
  [HttpKernel] fix parse error in DumpDataCollector
  [TwigBundle/DebugBundle] move dump extension & cleanups
  Adjust upgrade file rendering
  [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
  compare version using PHP_VERSION_ID
  [Form] Add doc for FormEvents
  *_timezone changes also affect the BirthdayType
  don't override internal PHP constants
  Drop support for model_timezone and view_timezone options in TimeType and DateType.
  [DomCrawler] Added support for link tags in the Link class
  [Session] Fix parameter names in WriteCheckSessionHandler
  Add consistency with request type checking
  [FrameworkBundle] Fix server run in case the router script does not exist

Author: fabpot

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;
     }
 
     /**