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

Tests/Fixtures/FilesLoader.php

@@ -27,7 +27,7 @@ public function __construct(array $paths, LoaderInterface $loader)
 
     protected function getFileLoaderInstance($file)
     {
-        $this->timesCalled++;
+        ++$this->timesCalled;
 
         return $this->loader;
     }