Merge branch '2.3' into 2.6

fabpot · fabpot · commit cdd2168e61f5 · 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/Loader/MoFileLoader.php b/Loader/MoFileLoader.php
@@ -116,7 +116,7 @@ private function parse($resource)
 
         $messages = array();
 
-        for ($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; ++$i) {
             $singularId = $pluralId = null;
             $translated = null;
 
diff --git a/Tests/PluralizationRulesTest.php b/Tests/PluralizationRulesTest.php
@@ -112,7 +112,7 @@ protected function generateTestData($plural, $langCodes)
     {
         $matrix = array();
         foreach ($langCodes as $langCode) {
-            for ($count = 0; $count < 200; $count++) {
+            for ($count = 0; $count < 200; ++$count) {
                 $plural = PluralizationRules::get($count, $langCode);
                 $matrix[$langCode][$count] = $plural;
             }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected function generateTestData($plural, $langCodes)`
`112`	`112`	`{`
`113`	`113`	`$matrix = array();`
`114`	`114`	`foreach ($langCodes as $langCode) {`
`115`		`- for ($count = 0; $count < 200; $count++) {`
	`115`	`+ for ($count = 0; $count < 200; ++$count) {`
`116`	`116`	`$plural = PluralizationRules::get($count, $langCode);`
`117`	`117`	`$matrix[$langCode][$count] = $plural;`
`118`	`118`	`}`