Merge branch '2.6' into 2.7

fabpot · fabpot · commit 2c1a8b4e343e · 2015-05-15T15:33:16.000+02:00
* 2.6:
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Component/Finder/Expression/Glob.php
diff --git a/Tests/Logger/DbalLoggerTest.php b/Tests/Logger/DbalLoggerTest.php
@@ -121,7 +121,7 @@ public function testLogUTF8LongString()
 
         $shortString = '';
         $longString = '';
-        for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; $i++) {
+        for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; ++$i) {
             $shortString .= $testStringArray[$i % $testStringCount];
             $longString .= $testStringArray[$i % $testStringCount];
         }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function testLogUTF8LongString()`
`121`	`121`
`122`	`122`	`$shortString = '';`
`123`	`123`	`$longString = '';`
`124`		`- for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; $i++) {`
	`124`	`+ for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; ++$i) {`
`125`	`125`	`$shortString .= $testStringArray[$i % $testStringCount];`
`126`	`126`	`$longString .= $testStringArray[$i % $testStringCount];`
`127`	`127`	`}`