Merge branch '2.6' into 2.7

* 2.6: [DebugBundle] Allow alternative destination for dumps [DebugBundle] Use output mechanism of dumpers instead of echoing [DebugBundle] Always collect dumps Fix tests in HHVM CS: Pre incrementation/decrementation should be used if possible Conflicts: src/Symfony/Component/Finder/Expression/Glob.php
symfony · May 15, 2015 · 08cd138 · 08cd138
2 parents 267921c + f601e6b
commit 08cd138
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Tests/Fixtures/FilesLoader.php b/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;
     }