Skip to content

Commit d5326b2

Browse files
committed
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
2 parents 2ab9eba + bbab396 commit d5326b2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Loader/FileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
9191
}
9292

9393
$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) {
9595
if (isset(self::$loading[$resources[$i]])) {
9696
if ($i == $resourcesCount - 1) {
9797
throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading));

0 commit comments

Comments
 (0)