Merge branch '2.3' into 2.6

fabpot · fabpot · commit bbab396b1e24 · 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/FileLoader.php b/Loader/FileLoader.php
@@ -91,7 +91,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             }
 
             $resources = is_array($resource) ? $resource : array($resource);
-            for ($i = 0; $i < $resourcesCount = count($resources); $i++) {
+            for ($i = 0; $i < $resourcesCount = count($resources); ++$i) {
                 if (isset(self::$loading[$resources[$i]])) {
                     if ($i == $resourcesCount - 1) {
                         throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading));

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$resources = is_array($resource) ? $resource : array($resource);`
`94`		`- for ($i = 0; $i < $resourcesCount = count($resources); $i++) {`
	`94`	`+ for ($i = 0; $i < $resourcesCount = count($resources); ++$i) {`
`95`	`95`	`if (isset(self::$loading[$resources[$i]])) {`
`96`	`96`	`if ($i == $resourcesCount - 1) {`
`97`	`97`	`throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading));`