Merge branch '2.3' into 2.6

fabpot · fabpot · commit ffedd3e0ff81 · 2015-05-15T15:32:45.000+02:00
* 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
diff --git a/Expression/Glob.php b/Expression/Glob.php
@@ -105,7 +105,7 @@ public function toRegex($strictLeadingDot = true, $strictWildcardSlash = true)
         $inCurlies = 0;
         $regex = '';
         $sizeGlob = strlen($this->pattern);
-        for ($i = 0; $i < $sizeGlob; $i++) {
+        for ($i = 0; $i < $sizeGlob; ++$i) {
             $car = $this->pattern[$i];
             if ($firstByte) {
                 if ($strictLeadingDot && '.' !== $car) {
diff --git a/Glob.php b/Glob.php
@@ -51,7 +51,7 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS
         $inCurlies = 0;
         $regex = '';
         $sizeGlob = strlen($glob);
-        for ($i = 0; $i < $sizeGlob; $i++) {
+        for ($i = 0; $i < $sizeGlob; ++$i) {
             $car = $glob[$i];
             if ($firstByte) {
                 if ($strictLeadingDot && '.' !== $car) {
diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -475,7 +475,7 @@ public function testCountDirectories()
         $i = 0;
 
         foreach ($directory as $dir) {
-            $i++;
+            ++$i;
         }
 
         $this->assertCount($i, $directory);
@@ -487,7 +487,7 @@ public function testCountFiles()
         $i = 0;
 
         foreach ($files as $file) {
-            $i++;
+            ++$i;
         }
 
         $this->assertCount($i, $files);
diff --git a/Tests/Iterator/FilterIteratorTest.php b/Tests/Iterator/FilterIteratorTest.php
@@ -31,7 +31,7 @@ public function testFilterFilesystemIterators()
 
         $c = 0;
         foreach ($i as $item) {
-            $c++;
+            ++$c;
         }
 
         $this->assertEquals(1, $c);
@@ -40,7 +40,7 @@ public function testFilterFilesystemIterators()
 
         $c = 0;
         foreach ($i as $item) {
-            $c++;
+            ++$c;
         }
 
         // This would fail with \FilterIterator but works with Symfony\Component\Finder\Iterator\FilterIterator

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ public function testCountDirectories()`
`475`	`475`	`$i = 0;`
`476`	`476`
`477`	`477`	`foreach ($directory as $dir) {`
`478`		`- $i++;`
	`478`	`+ ++$i;`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`$this->assertCount($i, $directory);`
`@@ -487,7 +487,7 @@ public function testCountFiles()`
`487`	`487`	`$i = 0;`
`488`	`488`
`489`	`489`	`foreach ($files as $file) {`
`490`		`- $i++;`
	`490`	`+ ++$i;`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`$this->assertCount($i, $files);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testFilterFilesystemIterators()`
`31`	`31`
`32`	`32`	`$c = 0;`
`33`	`33`	`foreach ($i as $item) {`
`34`		`- $c++;`
	`34`	`+ ++$c;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$this->assertEquals(1, $c);`
`@@ -40,7 +40,7 @@ public function testFilterFilesystemIterators()`
`40`	`40`
`41`	`41`	`$c = 0;`
`42`	`42`	`foreach ($i as $item) {`
`43`		`- $c++;`
	`43`	`+ ++$c;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// This would fail with \FilterIterator but works with Symfony\Component\Finder\Iterator\FilterIterator`