Merge branch '2.3' into 2.6

* 2.3: Fix tests in HHVM CS: Pre incrementation/decrementation should be used if possible Conflicts: src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
symfony · May 15, 2015 · 92f809c · 92f809c
2 parents 0d82153 + e4ca50e
commit 92f809c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/IpUtils.php b/IpUtils.php
@@ -110,7 +110,7 @@ public static function checkIp6($requestIp, $ip)
         $bytesAddr = unpack('n*', inet_pton($address));
         $bytesTest = unpack('n*', inet_pton($requestIp));
 
-        for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; $i++) {
+        for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
             $left = ($left <= 16) ? $left : 16;
             $mask = ~(0xffff >> $left) & 0xffff;

diff --git a/ParameterBag.php b/ParameterBag.php
@@ -113,7 +113,7 @@ public function get($path, $default = null, $deep = false)
 
         $value = $this->parameters[$root];
         $currentKey = null;
-        for ($i = $pos, $c = strlen($path); $i < $c; $i++) {
+        for ($i = $pos, $c = strlen($path); $i < $c; ++$i) {
             $char = $path[$i];
 
             if ('[' === $char) {

diff --git a/Request.php b/Request.php
@@ -1591,7 +1591,7 @@ public function getLanguages()
                         $lang = $codes[1];
                     }
                 } else {
-                    for ($i = 0, $max = count($codes); $i < $max; $i++) {
+                    for ($i = 0, $max = count($codes); $i < $max; ++$i) {
                         if ($i === 0) {
                             $lang = strtolower($codes[0]);
                         } else {

diff --git a/Tests/HeaderBagTest.php b/Tests/HeaderBagTest.php
@@ -196,7 +196,7 @@ public function testGetIterator()
 
         $i = 0;
         foreach ($headerBag as $key => $val) {
-            $i++;
+            ++$i;
             $this->assertEquals(array($headers[$key]), $val);
         }
 

diff --git a/Tests/ParameterBagTest.php b/Tests/ParameterBagTest.php
@@ -233,7 +233,7 @@ public function testGetIterator()
 
         $i = 0;
         foreach ($bag as $key => $val) {
-            $i++;
+            ++$i;
             $this->assertEquals($parameters[$key], $val);
         }
 

diff --git a/Tests/Session/Attribute/AttributeBagTest.php b/Tests/Session/Attribute/AttributeBagTest.php
@@ -177,7 +177,7 @@ public function testGetIterator()
         $i = 0;
         foreach ($this->bag as $key => $val) {
             $this->assertEquals($this->array[$key], $val);
-            $i++;
+            ++$i;
         }
 
         $this->assertEquals(count($this->array), $i);

diff --git a/Tests/Session/Flash/FlashBagTest.php b/Tests/Session/Flash/FlashBagTest.php
@@ -145,7 +145,7 @@ public function testGetIterator()
         $i = 0;
         foreach ($this->bag as $key => $val) {
             $this->assertEquals(array($flashes[$key]), $val);
-            $i++;
+            ++$i;
         }
 
         $this->assertEquals(count($flashes), $i);

diff --git a/Tests/Session/SessionTest.php b/Tests/Session/SessionTest.php
@@ -203,7 +203,7 @@ public function testGetIterator()
         $i = 0;
         foreach ($this->session as $key => $val) {
             $this->assertEquals($attributes[$key], $val);
-            $i++;
+            ++$i;
         }
 
         $this->assertEquals(count($attributes), $i);