Merge branch '2.7' into 2.8

fabpot · fabpot · commit 414376235fe9 · 2017-01-21T08:53:15.000-08:00
* 2.7:
  fixed CS
  fixed CS fixer config
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -298,7 +298,7 @@ private function htmlEncode($s)
     {
         $html = '';
 
-        $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
+        $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
         $dumper->setDumpHeader('');
         $dumper->setDumpBoundaries('', '');
 

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ private function htmlEncode($s)`
`298`	`298`	`{`
`299`	`299`	`$html = '';`
`300`	`300`
`301`		`- $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);`
	`301`	`+ $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);`
`302`	`302`	`$dumper->setDumpHeader('');`
`303`	`303`	`$dumper->setDumpBoundaries('', '');`
`304`	`304`