Merge branch '2.6' into 2.7

* 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

2 files changed, 3 insertions, 3 deletions

diff --git a/Core/Encoder/MessageDigestPasswordEncoder.php b/Core/Encoder/MessageDigestPasswordEncoder.php
index 03de228..1706fc8 100644
--- a/Core/Encoder/MessageDigestPasswordEncoder.php
+++ b/Core/Encoder/MessageDigestPasswordEncoder.php
@@ -55,7 +55,7 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder
         $digest = hash($this->algorithm, $salted, true);
 
         // "stretch" hash
-        for ($i = 1; $i < $this->iterations; $i++) {
+        for ($i = 1; $i < $this->iterations; ++$i) {
             $digest = hash($this->algorithm, $digest.$salted, true);
         }
 
diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php
index dac1cad..6f24c4f 100644
--- a/Core/Encoder/Pbkdf2PasswordEncoder.php
+++ b/Core/Encoder/Pbkdf2PasswordEncoder.php
@@ -87,11 +87,11 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder
         $blocks = ceil($length / strlen(hash($algorithm, null, true)));
         $digest = '';
 
-        for ($i = 1; $i <= $blocks; $i++) {
+        for ($i = 1; $i <= $blocks; ++$i) {
             $ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true);
 
             // Iterations
-            for ($j = 1; $j < $iterations; $j++) {
+            for ($j = 1; $j < $iterations; ++$j) {
                 $ib ^= ($block = hash_hmac($algorithm, $block, $password, true));
             }